Revert "Make gras compil with Visual C++." This commit is too large/unreadable. It...

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e87b427..e40adb6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,19 +7,20 @@ 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("C_COMPILER                        $ENV{CC}")
-    message("CXX_COMPILER              $ENV{CXX}")
-    message("MAKE_PROGRAM              ${CMAKE_MAKE_PROGRAM}")
-    message("RC_COMPILER               $ENV{RC}")
-    message("INCLUDE                   $ENV{INCLUDE}")
-    message("LIB                               $ENV{LIB}")
-    
-    if(NOT EXISTS "$ENV{CC}.exe" OR NOT EXISTS "$ENV{CXX}.exe" OR OR NOT EXISTS "$ENV{RC}.exe" OR NOT EXISTS "$ENV{INCLUDE}" OR OR NOT EXISTS "$ENV{LIB}")
-       message(FATAL_ERROR "Need to set correctely CC, CXX, RC, INCLUDE and LIB environment variables.")
-    endif(NOT EXISTS "$ENV{CC}.exe" OR NOT EXISTS "$ENV{CXX}.exe" OR OR NOT EXISTS "$ENV{RC}.exe" OR NOT EXISTS "$ENV{INCLUDE}" OR OR NOT EXISTS "$ENV{LIB}")
+       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
@@ -50,50 +51,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