[PATCH] D25724: [cmake] Declare LLVM_CMAKE_PATH for use in subprojects

[Michał Górny via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL284581: [cmake] Declare LLVM_CMAKE_PATH for use in subprojects (authored by mgorny).

Changed prior to commit:
  https://reviews.llvm.org/D25724?vs=74985&id=75131#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D25724

Files:
  llvm/trunk/CMakeLists.txt
  llvm/trunk/lib/LTO/CMakeLists.txt


Index: llvm/trunk/CMakeLists.txt
===================================================================
--- llvm/trunk/CMakeLists.txt
+++ llvm/trunk/CMakeLists.txt
@@ -263,6 +263,8 @@
 set(LLVM_MAIN_INCLUDE_DIR ${LLVM_MAIN_SRC_DIR}/include ) # --includedir
 set(LLVM_BINARY_DIR       ${CMAKE_CURRENT_BINARY_DIR}  ) # --prefix
 
+# Note: LLVM_CMAKE_PATH does not include generated files
+set(LLVM_CMAKE_PATH ${LLVM_MAIN_SRC_DIR}/cmake/modules)
 set(LLVM_EXAMPLES_BINARY_DIR ${LLVM_BINARY_DIR}/examples)
 set(LLVM_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include)
 
Index: llvm/trunk/lib/LTO/CMakeLists.txt
===================================================================
--- llvm/trunk/lib/LTO/CMakeLists.txt
+++ llvm/trunk/lib/LTO/CMakeLists.txt
@@ -21,7 +21,7 @@
 # The VC revision include that we want to generate.
 set(version_inc "${CMAKE_CURRENT_BINARY_DIR}/LLVMLTORevision.h")
 
-set(get_svn_script "${LLVM_MAIN_SRC_DIR}/cmake/modules/GenerateVersionFromCVS.cmake")
+set(get_svn_script "${LLVM_CMAKE_PATH}/GenerateVersionFromCVS.cmake")
 
 if(DEFINED llvm_vc)
   # Create custom target to generate the VC revision include.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D25724.75131.patch
Type: text/x-patch
Size: 1128 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20161019/94602d32/attachment.bin>