X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ce4c8b29c65ff5537f92a3804d45979af9a060d..839877aee607c198ffda1d836d72976831819825:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb26cff8ed..29e9a435c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,8 +25,27 @@ else(APPLE)
 endif(APPLE)
 
 ### Set some variables for Cmake
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
-set(INCLUDES ${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}/include ${PROJECT_BINARY_DIR}/src/include ${PROJECT_BINARY_DIR}/src)
+SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
+
+if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
+	set(INCLUDES
+	${CMAKE_HOME_DIRECTORY}
+	${CMAKE_HOME_DIRECTORY}/include
+	${CMAKE_HOME_DIRECTORY}/src
+	${CMAKE_HOME_DIRECTORY}/src/include
+	)
+else("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
+	set(INCLUDES
+	${CMAKE_HOME_DIRECTORY}
+	${CMAKE_HOME_DIRECTORY}/include
+	${CMAKE_HOME_DIRECTORY}/src
+	${CMAKE_HOME_DIRECTORY}/src/include
+	${CMAKE_BINARY_DIR}
+	${CMAKE_BINARY_DIR}/include
+	${CMAKE_BINARY_DIR}/src
+	)
+endif("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
+
 set(INCLUDES ${INCLUDES} ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_HOME_DIRECTORY}/src/include ${CMAKE_HOME_DIRECTORY}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
 if(WIN32)
     set(INCLUDES ${INCLUDES} ${CMAKE_HOME_DIRECTORY}/include/xbt ${CMAKE_HOME_DIRECTORY}/src/xbt) #for win32_ucontext.[ch]
@@ -124,6 +143,11 @@ endif(WIN32)
 
 include_directories(${INCLUDES})
 
+
+### Determine the assembly flavor that we need today
+include(CMakeDetermineSystem)
+set(PROCESSOR_${CMAKE_SYSTEM_PROCESSOR} 1)
+
 ### Setup Options
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Option.cmake)
 
@@ -147,9 +171,6 @@ else(WIN32)
     include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeExeLib.cmake)
 endif(WIN32)
 
-### Build the doc
-include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake)
-
 ### Make Simgrid.jar and Java examples
 if(HAVE_JAVA)
 	include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeJava.cmake)
@@ -170,6 +191,9 @@ include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Distrib.cmake)
 ### Pipol compilation
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Pipol.cmake)
 
+### Build the doc
+include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake)
+
 ### Print ARGS
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)