prefer out-of-source generated headers

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 135d01d..1037522 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 "-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")
 if(WIN32)
     set(INCLUDES "${INCLUDES} -I${PROJECT_DIRECTORY}/include/xbt -I${PROJECT_DIRECTORY}/src/xbt") #for win32_ucontext.[ch]
 endif(WIN32)
 set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
 
-if(EXISTS /usr/include/)
+if(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)
        set(INCLUDES "${INCLUDES} -I/usr/include/")
-endif(EXISTS /usr/include/)
+endif(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)
 
 ### Check 32bits or 64bits
 INCLUDE (CheckTypeSize)
@@ -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)