Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
factor get_remaining across acitvities
[simgrid.git] / CMakeLists.txt
index 50d67d5..ad1dd5b 100644 (file)
@@ -91,7 +91,7 @@ endif()
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "21")
+set(SIMGRID_VERSION_MINOR "22")
 set(SIMGRID_VERSION_PATCH "90")
 set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
 
@@ -254,7 +254,7 @@ endif()
 set(_Boost_STACKTRACE_HEADERS           "boost/stacktrace.hpp")
 set(_Boost_STACKTRACE_BACKTRACE_HEADERS "boost/stacktrace.hpp")
 
-find_package(Boost 1.59 COMPONENTS context stacktrace_backtrace unit_test_framework)
+find_package(Boost 1.59 COMPONENTS context stacktrace_backtrace)
 set(Boost_FOUND 1) # These components are optionals
 message(STATUS "Mandatory components found. SimGrid is compilable.")
 message(STATUS "Looking for optional Boost components:")
@@ -276,12 +276,6 @@ else()
   set(HAVE_BOOST_CONTEXTS 0)
 endif()
 
-if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
-  message(STATUS  "  unit_test_framework: found. Activating the Boost-based unit tests.")
-else()
-  message(STATUS  "  unit_test_framework: MISSING. Install libboost-test-dev (>= v1.59) to activate the Unit Tests.")
-endif()
-
 
 # Checks for header libraries functions.
 CHECK_LIBRARY_EXISTS(rt      clock_gettime           "" HAVE_POSIX_GETTIME)
@@ -467,44 +461,28 @@ file(REMOVE test_stackgrowth)
 ## GIT version check
 ##
 if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/)
-  execute_process(
-     COMMAND git remote
-     COMMAND head -n 1
-     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
-     OUTPUT_VARIABLE remote
+  execute_process(COMMAND git rev-parse --verify --short HEAD
+     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
+     OUTPUT_VARIABLE GIT_VERSION
      OUTPUT_STRIP_TRAILING_WHITESPACE)
-  #message(STATUS "Git remote: ${remote}")
-  execute_process(COMMAND git config --get remote.${remote}.url
-     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
-     OUTPUT_VARIABLE url
-     OUTPUT_STRIP_TRAILING_WHITESPACE)
-  #message(STATUS "Git url: ${url}")
-  if(url)
-    execute_process(COMMAND git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log --pretty=oneline --abbrev-commit -1
-       WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
-       OUTPUT_VARIABLE GIT_VERSION
-       OUTPUT_STRIP_TRAILING_WHITESPACE)
-    message(STATUS "Git version: ${GIT_VERSION}")
-
-    execute_process(COMMAND git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log -n 1 --pretty=format:%ai .
-       WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
-       OUTPUT_VARIABLE GIT_DATE 
-       OUTPUT_STRIP_TRAILING_WHITESPACE)
-    message(STATUS "Git date: ${GIT_DATE}")
-    string(REGEX REPLACE " .*" "" GIT_VERSION "${GIT_VERSION}")
-
-    execute_process(COMMAND git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log --pretty=format:%H -1
-       WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
-       OUTPUT_VARIABLE SIMGRID_GITHASH
-       OUTPUT_STRIP_TRAILING_WHITESPACE)
+  # Check for uncommitted changes
+  execute_process(COMMAND git diff --name-only HEAD
+    WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
+    OUTPUT_VARIABLE files_changed)
+  if(files_changed)
+    set(GIT_VERSION "${GIT_VERSION}-dirty")
   endif()
 elseif(EXISTS ${CMAKE_HOME_DIRECTORY}/.gitversion)
   FILE(STRINGS ${CMAKE_HOME_DIRECTORY}/.gitversion GIT_VERSION)
 else()
   set(GIT_VERSION "none, release version")
 endif()
+message(STATUS "Git version: ${GIT_VERSION}")
+
+### Define source packages for Libs
+include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake)
 
-### Setup gcc & clang flags
+### Setup gcc & clang flags (include after DefinePackage.cmake, and before generating header files)
 if (NOT MSVC)
   include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Flags.cmake)
 endif()
@@ -751,14 +729,10 @@ endif()
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
   "${generated_files_to_clean}")
 
-### Define source packages for Libs
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake)
-
 add_custom_target(tests COMMENT "Recompiling the tests")
 
 ### Build some Maintainer files
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MaintainerMode.cmake)
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/UnitTesting.cmake)
 
 ### Make Libs
 if(NOT WIN32)