X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8fe1e3cca5bb3ef3d4ed2d2940eac845ed956f90..9340ba56ce8edd9022eac3be424b11ece66b6444:/buildtools/Cmake/src/CMakeMakeExeLib.txt diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt index 547f4c2ac7..aa16e13a9a 100644 --- 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) +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}) @@ -58,6 +63,11 @@ target_link_libraries(smpi simgrid ${SMPI_DEP} -fprofile-arcs) ### 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) @@ -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 "${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")