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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c9af54a32..30d3213075 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,20 +7,6 @@ set(release_version "3.5")
 set(libsimgrid_version "${release_version}")
 set(libgras_version "${release_version}")
 set(libsmpi_version "${release_version}")
-exec_program("${CMAKE_COMMAND} -E remove -f ${simgrid_BINARY_DIR}/CTestTestfile.cmake" OUTPUT_VARIABLE rmok)
-
-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")
-endif(WIN32)
 
 ### Find programs and paths
 find_path(GCOV_PATH NAMES gcov PATHS NO_DEFAULT_PATHS)
@@ -30,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/)
@@ -40,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)
@@ -50,50 +53,35 @@ else(enable_coverage)
 endif(enable_coverage)
 
 ### Setup Options
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeOption.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/Option.cmake)
 
 ### Make the *.h files with *.h.in files
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeCompleteInFiles.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/CompleteInFiles.cmake)
 
 ### Define source packages for Libs 
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDefinePackages.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/DefinePackages.cmake)
 
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeMaintainerMode.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/MaintainerMode.cmake)
 
 ### Setup gcc flags
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeFlags.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/Flags.cmake)
 
 ### Make Libs and Exes
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeMakeExeLib.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/MakeExeLib.cmake)
 
 ### Make Simgrid.jar and Java examples
 if(HAVE_JAVA)
-	include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeJarAndClass.txt)
+	include(${PROJECT_DIRECTORY}/buildtools/Cmake/MakeJava.cmake)
 endif(HAVE_JAVA)
 
 ### Make tests
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeTest.txt)
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CTestConfig.cmake)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/AddTests.cmake)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)
 
 ### Setup the distrib
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDistrib.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/Distrib.cmake)
 
 ### Print ARGS
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakePrintArgs.txt)
-
-INCLUDE(Dart)
-
-exec_program("ctest -N" OUTPUT_VARIABLE LIST_OF_TEST)
-string(REPLACE "\n" ";" LIST_OF_TEST ${LIST_OF_TEST})
-foreach(test ${LIST_OF_TEST})
-	string(REGEX REPLACE "^.*Test.*project.*" " " test ${test})
-	string(REGEX REPLACE "^.*Total.*Tests:.*" " " test ${test})
-	string(REGEX MATCH "^.*Testing.*" test_ok_1 ${test}) #for ctest version 2.6 (xxx/xxx Testing)
-	string(REGEX MATCH "^.*Test.*\\:+" test_ok_2 ${test}) #for ctest version 2.8 (Test #xxx)
-	if(test_ok_1 OR test_ok_2)
-		string(REGEX REPLACE "^.*Testing" " " test ${test}) #for ctest version 2.6
-		string(REGEX REPLACE "^.*Test.*\\:+" " " test ${test}) #for ctest version 2.8
-		string(STRIP ${test} test)
-		set_tests_properties(${test} PROPERTIES LABELS "rev${SVN_VERSION}")
-	endif(test_ok_1 OR test_ok_2)
-endforeach(test ${LIST_OF_TEST})
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)
+
+INCLUDE(Dart)
\ No newline at end of file