X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa2662427da4a4b81ea2e67561a223b9c4c3b4d0..21356cb0949b83667e4ba61de007c0c7847ab709:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e40adb6f0f..30d3213075 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,21 +8,6 @@ set(libsimgrid_version "${release_version}")
 set(libgras_version "${release_version}")
 set(libsmpi_version "${release_version}")
 
-if(WIN32)
-	message("	Be sure all those variables are correctely set.")
-    message("		-- C_COMPILER			$ENV{CC}")
-    message("		-- CXX_COMPILER			$ENV{CXX}")    
-    message("		-- RC_COMPILER			$ENV{RC}")
-    message("		-- INCLUDE			$ENV{INCLUDE}")
-    message("		-- LIB				$ENV{LIB}")
-    message("		-- MAKE_PROGRAM			${CMAKE_MAKE_PROGRAM}")
-    message("		-- CMAKE_BUILD_TOOL			${CMAKE_BUILD_TOOL}")
-    message("		-- LINKER				${CMAKE_LINKER}")
-    message("		-- CMAKE_GENERATOR			${CMAKE_GENERATOR}\n\n")
-    set(__STRICT_ANSI__ 1)
-    set(_MSC_VER 1)
-endif(WIN32)
-
 ### Find programs and paths
 find_path(GCOV_PATH NAMES gcov PATHS NO_DEFAULT_PATHS)
 find_path(VALGRIND_PATH	NAMES valgrind	PATHS NO_DEFAULT_PATHS)
@@ -31,9 +16,8 @@ find_path(VALGRIND_PATH	NAMES valgrind	PATHS NO_DEFAULT_PATHS)
 SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}")
 
 ### Set some variables for Cmake
-#SET(PROJECT_SOURCE_DIRECTORY "${PROJECT_DIRECTORY}/src") #this one is evil since it speaks to CPack instead
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
-set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I${CMAKE_CURRENT_BINARY_DIR}/src/")
+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(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
 
 if(EXISTS /usr/include/)
@@ -41,7 +25,25 @@ if(EXISTS /usr/include/)
 endif(EXISTS /usr/include/)
 
 if(WIN32)
-	set(INCLUDES "${INCLUDES} -I$ENV{INCLUDE}")
+	set(INCLUDES_MORE $ENV{INCLUDE})
+	string(REPLACE "\\" "/" INCLUDES_MORE "${INCLUDES_MORE}")
+	foreach(include_dir ${INCLUDES_MORE})
+		set(INCLUDES "${INCLUDES} -I\"${include_dir}\"")
+	endforeach(include_dir ${INCLUDES_MORE})
+	message("	Be sure all those variables are correctely set.")
+    message("		-- C_COMPILER			$ENV{CC}")
+    message("		-- CXX_COMPILER			$ENV{CXX}")    
+    message("		-- RC_COMPILER			$ENV{RC}")
+    message("		-- INCLUDE			$ENV{INCLUDE}")
+    message("		-- LIB				$ENV{LIB}")
+    message("		-- MAKE_PROGRAM			${CMAKE_MAKE_PROGRAM}")
+    message("		-- CMAKE_BUILD_TOOL		${CMAKE_BUILD_TOOL}")
+    message("		-- LINKER			${CMAKE_LINKER}")
+    message("		-- CMAKE_GENERATOR		${CMAKE_GENERATOR}")
+    message("		-- INCLUDES			${INCLUDES}\n\n")
+    set(__STRICT_ANSI__ 1)
+    set(_MSC_VER 1)
+    set(_WIN32 1)
 endif(WIN32)
 
 if(enable_coverage)