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
This link should be created by cmake, but update it in the svn since it exists here...
[simgrid.git]
/
buildtools
/
Cmake
/
src
/
CMakeMakeExeLib.txt
diff --git
a/buildtools/Cmake/src/CMakeMakeExeLib.txt
b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index
547f4c2
..
aa16e13
100644
(file)
--- a/
buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/
buildtools/Cmake/src/CMakeMakeExeLib.txt
@@
-42,6
+42,11
@@
if(HAVE_GTNETS)
SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
endif(HAVE_GTNETS)
SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
endif(HAVE_GTNETS)
+if(HAVE_POSIX_GETTIME)
+ SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt")
+ SET(GRAS_DEP "${GRAS_DEP} -lrt")
+endif(HAVE_POSIX_GETTIME)
+
if(NOT HAVE_RUBY_H)
string(REPLACE "${libruby} -l" "" SIMGRID_DEP ${SIMGRID_DEP})
string(REPLACE "${libruby}" "" SIMGRID_DEP ${SIMGRID_DEP})
if(NOT HAVE_RUBY_H)
string(REPLACE "${libruby} -l" "" SIMGRID_DEP ${SIMGRID_DEP})
string(REPLACE "${libruby}" "" SIMGRID_DEP ${SIMGRID_DEP})
@@
-58,6
+63,11
@@
target_link_libraries(smpi simgrid ${SMPI_DEP} -fprofile-arcs)
### Make EXEs
### Make EXEs
+if(enable_maintainer_mode)
+#src
+add_subdirectory(${PROJECT_DIRECTORY}/src)
+endif(enable_maintainer_mode)
+
#tools
#tools/gras
add_subdirectory(${PROJECT_DIRECTORY}/tools/gras)
#tools
#tools/gras
add_subdirectory(${PROJECT_DIRECTORY}/tools/gras)
@@
-153,7
+163,7
@@
file(APPEND ${PROJECT_DIRECTORY}/make_simgrid_java.sh "mkdir ${PROJECT_DIRECTORY
file(APPEND ${PROJECT_DIRECTORY}/make_simgrid_java.sh "cp ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd ${PROJECT_DIRECTORY}/src/.classes/surf/simgrid.dtd\n")
file(APPEND ${PROJECT_DIRECTORY}/make_simgrid_java.sh "\n")
file(APPEND ${PROJECT_DIRECTORY}/make_simgrid_java.sh "cp ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd ${PROJECT_DIRECTORY}/src/.classes/surf/simgrid.dtd\n")
file(APPEND ${PROJECT_DIRECTORY}/make_simgrid_java.sh "\n")
-file(APPEND ${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_ARCHIVE} cvf ./src/simgrid.jar -C ${PROJECT_DIRECTORY}/src/.classes
-silent
. &>/dev/null\n")
+file(APPEND ${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_ARCHIVE} cvf ./src/simgrid.jar -C ${PROJECT_DIRECTORY}/src/.classes . &>/dev/null\n")
file(APPEND ${PROJECT_DIRECTORY}/make_simgrid_java.sh "\n")
file(APPEND ${PROJECT_DIRECTORY}/make_simgrid_java.sh "echo \"[ 50%] Building JAR object src/simgrid.jar\"\n")
file(APPEND ${PROJECT_DIRECTORY}/make_simgrid_java.sh "\n")
file(APPEND ${PROJECT_DIRECTORY}/make_simgrid_java.sh "echo \"[ 50%] Building JAR object src/simgrid.jar\"\n")