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
backtrace: fix various portability issues I just introduced
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 25cd68fa92d61a539625acd0f0b722a415e5239d..77973ccfabae58ea2362fe5a5818d0e13f69bbee 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-108,7
+108,7
@@
endif()
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
set(SIMGRID_VERSION_MAJOR "3")
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "2
0
")
+set(SIMGRID_VERSION_MINOR "2
1
")
set(SIMGRID_VERSION_PATCH "90")
set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
set(SIMGRID_VERSION_PATCH "90")
set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
@@
-139,9
+139,9
@@
execute_process(COMMAND ${CMAKE_LINKER} -version OUTPUT_VARIABLE LINKER_VERSION
string(REGEX MATCH "[0-9].[0-9]*" LINKER_VERSION "${LINKER_VERSION}")
### Set the library providing dlopen
string(REGEX MATCH "[0-9].[0-9]*" LINKER_VERSION "${LINKER_VERSION}")
### Set the library providing dlopen
-if("${CMAKE_SYSTEM
}" MATCHES "
Linux")
+if("${CMAKE_SYSTEM
_NAME}" MATCHES "kFreeBSD|
Linux")
find_library(DL_LIBRARY dl)
find_library(DL_LIBRARY dl)
-endif(
"${CMAKE_SYSTEM}" MATCHES "Linux"
)
+endif()
### Find programs and paths
FIND_PROGRAM(GCOV_PATH gcov)
### Find programs and paths
FIND_PROGRAM(GCOV_PATH gcov)