MantisBT - CMake
View Issue Details
0010046CMakeCMakepublic2009-12-13 14:362010-09-09 23:55
troy d. straszheim 
Brad King 
normaltweakalways
closedfixed 
CMake-2-8 
CMake 2.8.3CMake 2.8.3 
0010046: cmake not buildable in subdirectory of another project
cmake's cmakelists.txt use CMAKE_SOURCE_DIR in a few places where they should use CMake_SOURCE_DIR, so that you can build cmake as a subdirectory of a larger project
diff --git a/cmake-2.8.0/Source/CMakeLists.txt b/cmake-2.8.0/Source/CMakeLists.txt
index 9099691..3487d0a 100644
--- a/cmake-2.8.0/Source/CMakeLists.txt
+++ b/cmake-2.8.0/Source/CMakeLists.txt
@@ -344,7 +344,7 @@ ENDIF(CMAKE_BUILD_ON_VISUAL_STUDIO OR MINGW)
 # CTestLib
 #
 INCLUDE_DIRECTORIES(
- "${CMAKE_SOURCE_DIR}/Source/CTest"
+ "${CMake_SOURCE_DIR}/Source/CTest"
   ${CMAKE_XMLRPC_INCLUDES}
   ${CMAKE_CURL_INCLUDES}
   )
@@ -488,7 +488,7 @@ IF(BUILD_QtDialog)
 ENDIF(BUILD_QtDialog)
 
 INCLUDE (${CMAKE_BINARY_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
-INCLUDE (${CMAKE_SOURCE_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
+INCLUDE (${CMake_SOURCE_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
 
 INSTALL_TARGETS(/bin cmake)
 INSTALL_TARGETS(/bin ctest)
No tags attached.
Issue History
2009-12-13 14:36troy d. straszheimNew Issue
2010-07-29 11:23Brad KingStatusnew => assigned
2010-07-29 11:23Brad KingAssigned To => Brad King
2010-07-29 11:23Brad KingNote Added: 0021549
2010-07-29 11:23Brad KingStatusassigned => closed
2010-07-29 11:23Brad KingResolutionopen => fixed
2010-09-09 23:55David ColeFixed in Version => CMake 2.8.3
2010-09-09 23:55David ColeTarget Version => CMake 2.8.3

Notes
(0021549)
Brad King   
2010-07-29 11:23   
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df1e00ff [^]