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
remote copy and move in the plugin
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
342de40
..
b2faaf2
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-40,7
+40,7
@@
if(COMPILER_SUPPORTS_CXX11)
else()
message(FATAL_ERROR
"The compiler ${CMAKE_CXX_COMPILER} (v${CMAKE_CXX_COMPILER_VERSION}) has no C++11 support. "
else()
message(FATAL_ERROR
"The compiler ${CMAKE_CXX_COMPILER} (v${CMAKE_CXX_COMPILER_VERSION}) has no C++11 support. "
-
"Please use a decent C++ compiler
.")
+
"Please install a decent C++ compiler (remove CMakeCache.txt once it's installed)
.")
endif()
### And we need C11 standard, too
endif()
### And we need C11 standard, too
@@
-105,7
+105,7
@@
endif()
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
set(SIMGRID_VERSION_MAJOR "3")
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "1
7
")
+set(SIMGRID_VERSION_MINOR "1
8
")
set(SIMGRID_VERSION_PATCH "0")
set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
set(SIMGRID_VERSION_PATCH "0")
set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
@@
-205,7
+205,7
@@
IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64")
if (WIN32)
message(STATUS "Disable fast raw contexts on Windows.")
elseif(enable_address_sanitizer)
if (WIN32)
message(STATUS "Disable fast raw contexts on Windows.")
elseif(enable_address_sanitizer)
- message("Disable fast raw contexts with ASan")
+ message(
STATUS
"Disable fast raw contexts with ASan")
else()
set(HAVE_RAW_CONTEXTS 1)
endif()
else()
set(HAVE_RAW_CONTEXTS 1)
endif()
@@
-242,6
+242,7
@@
endif()
if(WIN32)
set(Boost_USE_STATIC_LIBS 1)
endif()
if(WIN32)
set(Boost_USE_STATIC_LIBS 1)
endif()
+
set(HAVE_PAPI 0)
if(enable_smpi_papi)
include(FindPAPI)
set(HAVE_PAPI 0)
if(enable_smpi_papi)
include(FindPAPI)
@@
-253,9
+254,9
@@
endif()
# Not finding this is perfectly OK
find_package(Boost COMPONENTS unit_test_framework)
if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
# Not finding this is perfectly OK
find_package(Boost COMPONENTS unit_test_framework)
if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
- message(
"-- (enabling the Boost-based unit tests)
")
+ message(
STATUS "Enabling the Boost-based unit tests.
")
else()
else()
- message(
"-- (disabling the Boost-based unit tests -- please install libboost-test-dev)
")
+ message(
STATUS "Disabling the Boost-based unit tests -- please install libboost-test-dev.
")
endif()
endif()
@@
-273,7
+274,7
@@
endif()
find_package(Boost COMPONENTS context)
set(Boost_FOUND 1) # This component is optional
if(Boost_CONTEXT_FOUND)
find_package(Boost COMPONENTS context)
set(Boost_FOUND 1) # This component is optional
if(Boost_CONTEXT_FOUND)
- message("Found Boost.Context")
+ message(
STATUS
"Found Boost.Context")
set(HAVE_BOOST_CONTEXTS 1)
else()
message (" boost : found.")
set(HAVE_BOOST_CONTEXTS 1)
else()
message (" boost : found.")
@@
-564,17
+565,17
@@
if(CMAKE_USE_PTHREADS_INIT)
endif()
set(HAVE_THREAD_CONTEXTS 1)
endif()
set(HAVE_THREAD_CONTEXTS 1)
- message(
"--
Support for thread context factory ok.")
+ message(
STATUS "
Support for thread context factory ok.")
endif()
set(HAVE_UCONTEXT_CONTEXTS 0)
if(NOT HAVE_UCONTEXT_H)
endif()
set(HAVE_UCONTEXT_CONTEXTS 0)
if(NOT HAVE_UCONTEXT_H)
- message(
"--
No ucontext factory: <ucontext.h> not found.")
+ message(
STATUS "
No ucontext factory: <ucontext.h> not found.")
elseif(APPLE)
elseif(APPLE)
- message(
"--
No ucontext factory: Apple don't want us to use them.")
+ message(
STATUS "
No ucontext factory: Apple don't want us to use them.")
set(HAVE_UCONTEXT_H 0)
elseif(enable_address_sanitizer)
set(HAVE_UCONTEXT_H 0)
elseif(enable_address_sanitizer)
- message(
"--
No ucontext factory: ASan does not support it (see http://code.google.com/p/address-sanitizer/issues/detail?id=189)")
+ message(
STATUS "
No ucontext factory: ASan does not support it (see http://code.google.com/p/address-sanitizer/issues/detail?id=189)")
else()
try_compile(compile_makecontext ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_makecontext.c
OUTPUT_VARIABLE compile_makecontext_output)
else()
try_compile(compile_makecontext ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_makecontext.c
OUTPUT_VARIABLE compile_makecontext_output)
@@
-582,10
+583,10
@@
else()
#If can have both context
if(compile_makecontext)
set(HAVE_UCONTEXT_CONTEXTS 1)
#If can have both context
if(compile_makecontext)
set(HAVE_UCONTEXT_CONTEXTS 1)
- message(
"--
Support for ucontext factory ok.")
+ message(
STATUS "
Support for ucontext factory ok.")
else()
else()
- message(
"--
Error: <ucontext.h> exists, but makecontext is not compilable. Compilation output:\n ${compile_makecontext_output}")
- message(
"--
No ucontext factory: makecontext() is not compilable.")
+ message(
STATUS "
Error: <ucontext.h> exists, but makecontext is not compilable. Compilation output:\n ${compile_makecontext_output}")
+ message(
STATUS "
No ucontext factory: makecontext() is not compilable.")
endif()
# Stack setup (size and address)
endif()
# Stack setup (size and address)
@@
-675,6
+676,11
@@
else()
set(GIT_VERSION "none, release version")
endif()
set(GIT_VERSION "none, release version")
endif()
+### Setup gcc & clang flags
+if (NOT MSVC)
+ include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GCCFlags.cmake)
+endif()
+
### Generate the required headers and scripts
#############################################
### Generate the required headers and scripts
#############################################
@@
-866,11
+872,6
@@
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake)
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MaintainerMode.cmake)
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/UnitTesting.cmake)
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MaintainerMode.cmake)
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/UnitTesting.cmake)
-### Setup gcc & clang flags
-if (NOT MSVC)
- include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GCCFlags.cmake)
-endif()
-
### Make Libs
if(NOT WIN32)
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeLib.cmake)
### Make Libs
if(NOT WIN32)
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeLib.cmake)