From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 9 Nov 2010 17:20:47 +0000 (+0000)
Subject: Fix CMake detection of dependencies between source files and headers
X-Git-Tag: v3_5~314
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/30a4019c0ba22d6ee8d732afac2b93773bb76ea1?hp=2b0ff033841e34f11903b3fd85f5faa6468ae3f2

Fix CMake detection of dependencies between source files and headers

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8513 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1037522468..292f43d9f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,15 +24,15 @@ endif(APPLE)
 
 ### Set some variables for Cmake
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
-set(INCLUDES "-I${PROJECT_BINARY_DIR} -I${PROJECT_BINARY_DIR}/include -I${PROJECT_BINARY_DIR}/src/include -I${PROJECT_BINARY_DIR}/src")
-set(INCLUDES "${INCLUDES} -I${PROJECT_DIRECTORY} -I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I${CMAKE_CURRENT_BINARY_DIR}/src")
+set(INCLUDES ${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}/include ${PROJECT_BINARY_DIR}/src/include ${PROJECT_BINARY_DIR}/src)
+set(INCLUDES ${INCLUDES} ${PROJECT_DIRECTORY} ${PROJECT_DIRECTORY}/include ${PROJECT_DIRECTORY}/src/include ${PROJECT_DIRECTORY}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
 if(WIN32)
-    set(INCLUDES "${INCLUDES} -I${PROJECT_DIRECTORY}/include/xbt -I${PROJECT_DIRECTORY}/src/xbt") #for win32_ucontext.[ch]
+    set(INCLUDES ${INCLUDES} ${PROJECT_DIRECTORY}/include/xbt ${PROJECT_DIRECTORY}/src/xbt) #for win32_ucontext.[ch]
 endif(WIN32)
 set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
 
 if(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)
-	set(INCLUDES "${INCLUDES} -I/usr/include/")
+	set(INCLUDES ${INCLUDES} /usr/include/)
 endif(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)
 
 ### Check 32bits or 64bits
@@ -53,9 +53,9 @@ if(WIN32)
 	        string(REGEX MATCH ".*[ ].*" testoki "${include_dir}")
 	        if(testoki)
 	        	string(REPLACE " " "\\ " include_dir "${include_dir}")
-	            set(INCLUDES "${INCLUDES} -I\"${include_dir}\"")
+	            set(INCLUDES ${INCLUDES} \"${include_dir}\")
 	        else(testoki)
-	            set(INCLUDES "${INCLUDES} -I${include_dir}")
+	            set(INCLUDES ${INCLUDES} ${include_dir})
 	        endif(testoki)
 	    else(IS_DIRECTORY ${include_dir})
 	        message(FATAL_ERROR "${include_dir} not find")
@@ -120,7 +120,7 @@ if(WIN32)
     
 endif(WIN32)
 
-add_definitions (${INCLUDES})
+include_directories(${INCLUDES})
 
 ### Setup Options
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/Option.cmake)
@@ -181,4 +181,4 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/Pipol.cmake)
 ### Print ARGS
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)
 
-INCLUDE(Dart)
\ No newline at end of file
+INCLUDE(Dart)