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
CMake: get ready for some future versions of ns-3
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 608622863293d46b85b411f6a3200034e0aba021..df9907e1a4c5b710f077da4111032f21d5c91eeb 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-2,7
+2,7
@@
set(SIMGRID_VERSION_MAJOR "3")
set(SIMGRID_VERSION_MINOR "28")
set(SIMGRID_VERSION_MAJOR "3")
set(SIMGRID_VERSION_MINOR "28")
-set(SIMGRID_VERSION_PATCH "
0
") # odd => git branch; even => stable release or released snapshot
+set(SIMGRID_VERSION_PATCH "
1
") # odd => git branch; even => stable release or released snapshot
if(${SIMGRID_VERSION_PATCH} EQUAL "0")
set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
if(${SIMGRID_VERSION_PATCH} EQUAL "0")
set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
@@
-548,8
+548,8
@@
file(READ ${CMAKE_HOME_DIRECTORY}/src/smpi/smpitools.sh SMPITOOLS_SH) # Definiti
### SMPI script used when simgrid is installed
set(exec_prefix ${CMAKE_INSTALL_PREFIX})
### SMPI script used when simgrid is installed
set(exec_prefix ${CMAKE_INSTALL_PREFIX})
-set(includedir "${CMAKE_INSTALL_
PREFIX}/${CMAKE_INSTA
LL_INCLUDEDIR}")
-set(libdir "${CMAKE_INSTALL_
PREFIX}/${CMAKE_INSTA
LL_LIBDIR}")
+set(includedir "${CMAKE_INSTALL_
FU
LL_INCLUDEDIR}")
+set(libdir "${CMAKE_INSTALL_
FU
LL_LIBDIR}")
set(includeflag "-I${includedir} -I${includedir}/smpi")
set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=\"${libdir}")
if(NS3_LIBRARY_PATH)
set(includeflag "-I${includedir} -I${includedir}/smpi")
set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=\"${libdir}")
if(NS3_LIBRARY_PATH)