[cmake-commits] alex committed CMakeLists.txt 1.10 1.11

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Jul 16 13:26:58 EDT 2007


Update of /cvsroot/CMake/CMake/Tests/OutOfSource/OutOfSourceSubdir
In directory public:/mounts/ram/cvs-serv12443/Tests/OutOfSource/OutOfSourceSubdir

Modified Files:
	CMakeLists.txt 
Log Message:

BUG: GET_DIRECTORY_PROPERTY(INCLUDE_DIRECTORIES|LINK_DIRECTORIES) wasn't
working, for both the result was always empty, since
cmMakefile::GetProperty() recognized it as a special property, constructed a
correct return value and called cmMakefile::SetProperty() with this list of
directories, which then didn't actually set the property, but applied it to
the internal vector of include/link directories. The following
getPropertyValue in cmMakefile::GetProperty() then still didn't find it and
returned nothing. Now for all special property the static string output is
used and its content is returned. I'm not sure it is the right way to fix
this problem but at least it seems to work and it fixes the Paraview3 build

Alex


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/OutOfSource/OutOfSourceSubdir/CMakeLists.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- CMakeLists.txt	21 Mar 2007 11:16:32 -0000	1.10
+++ CMakeLists.txt	16 Jul 2007 17:26:56 -0000	1.11
@@ -46,3 +46,9 @@
 
 # test getting a definition from a subdir
 SET (WEASELS SIZZLING)
+
+GET_DIRECTORY_PROPERTY(incDirs INCLUDE_DIRECTORIES)
+message(STATUS "incDirs: -${incDirs}")
+IF(NOT incDirs)
+   MESSAGE(FATAL_ERROR "GET_DIRECTORY_PROPERTY(INCLUDE_DIRECTORIES) returned empty list")
+ENDIF(NOT incDirs)



More information about the Cmake-commits mailing list