Fix CMake detection of dependencies between source files and headers

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 135d01d..292f43d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,17 +15,25 @@ FIND_PROGRAM(VALGRIND_PATH valgrind)
 ### SET THE PROJECT_DIRECTORY
 SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}")
 
+### SET THE LIBRARY EXTENSION
+if(APPLE)
+       set(LIB_EXE "dylib")
+else(APPLE)
+       set(LIB_EXE "so")
+endif(APPLE)
+
 ### Set some variables for Cmake
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
-set(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(EXISTS /usr/include/)
-       set(INCLUDES "${INCLUDES} -I/usr/include/")
-endif(EXISTS /usr/include/)
+if(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)
+       set(INCLUDES ${INCLUDES} /usr/include/)
+endif(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)
 
 ### Check 32bits or 64bits
 INCLUDE (CheckTypeSize)
@@ -45,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")
@@ -112,7 +120,7 @@ if(WIN32)
     
 endif(WIN32)
 
-add_definitions (${INCLUDES})
+include_directories(${INCLUDES})
 
 ### Setup Options
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/Option.cmake)
@@ -158,6 +166,8 @@ endif(HAVE_JAVA)
 ### Make tests
 if(NOT WIN32)
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/AddTests.cmake)
+else(NOT WIN32)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/AddTestsWin.cmake)
 endif(NOT WIN32)
 
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)
@@ -171,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)