A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
50d67d5
..
681c4cf
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-254,7
+254,7
@@
endif()
set(_Boost_STACKTRACE_HEADERS "boost/stacktrace.hpp")
set(_Boost_STACKTRACE_BACKTRACE_HEADERS "boost/stacktrace.hpp")
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:")
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()
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)
# Checks for header libraries functions.
CHECK_LIBRARY_EXISTS(rt clock_gettime "" HAVE_POSIX_GETTIME)
@@
-504,7
+498,10
@@
else()
set(GIT_VERSION "none, release version")
endif()
set(GIT_VERSION "none, release version")
endif()
-### Setup gcc & clang flags
+### Define source packages for Libs
+include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake)
+
+### 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()
if (NOT MSVC)
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Flags.cmake)
endif()
@@
-751,14
+748,10
@@
endif()
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
"${generated_files_to_clean}")
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)
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)
### Make Libs
if(NOT WIN32)