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
fix newly introduced issues
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
e2bb276
..
58b548b
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)
@@
-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)