[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.24 1.25
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Feb 17 16:21:44 EST 2010
Update of /cvsroot/CMake/CMake/Tests/ExternalProject
In directory public:/mounts/ram/cvs-serv31000/Tests/ExternalProject
Modified Files:
CMakeLists.txt
Log Message:
Fix problem with ExternalProject test in in-source builds.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExternalProject/CMakeLists.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** CMakeLists.txt 8 Sep 2009 19:37:15 -0000 1.24
--- CMakeLists.txt 17 Feb 2010 21:21:41 -0000 1.25
***************
*** 25,28 ****
--- 25,39 ----
endif()
endif()
+
+ # The ExternalProject builds of Tutorial Step5 cannot be built
+ # correctly 2nd and later times in an in-source build...
+ # (because the CMakeCache.txt from the real in-source build of
+ # the Tests/Tutorial/Step5 directory gets copied when we do
+ # the "source directory copy" step... but it still refers to
+ # its original path which yields a configure error.) So:
+ #
+ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
+ set(can_build_tutorial_step5 0)
+ endif()
endif()
More information about the Cmake-commits
mailing list