[libcxx] r191657 - [CMake] Put libcxx-specific module directories to the front of CMAKE_MODULE_PATH.

Alexey Samsonov samsonov at google.com
Mon Sep 30 02:10:01 PDT 2013


Author: samsonov
Date: Mon Sep 30 04:10:01 2013
New Revision: 191657

URL: http://llvm.org/viewvc/llvm-project?rev=191657&view=rev
Log:
[CMake] Put libcxx-specific module directories to the front of CMAKE_MODULE_PATH.

Otherwise if libcxx is built as an LLVM external project (after r191624),
"include(config-ix)" will include config-ix.cmake from LLVM, not from libcxx,
which will result in misconfigured build tree.

Modified:
    libcxx/trunk/CMakeLists.txt

Modified: libcxx/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=191657&r1=191656&r2=191657&view=diff
==============================================================================
--- libcxx/trunk/CMakeLists.txt (original)
+++ libcxx/trunk/CMakeLists.txt Mon Sep 30 04:10:01 2013
@@ -14,9 +14,9 @@ set(PACKAGE_BUGREPORT "llvmbugs at cs.uiuc.
 
 # Add path for custom modules
 set(CMAKE_MODULE_PATH
-  ${CMAKE_MODULE_PATH}
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
+  ${CMAKE_MODULE_PATH}
   )
 
 # Require out of source build.





More information about the cfe-commits mailing list