X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4bbc8305ba7bcc626cefb446b65ccd10ac2a2dc5..a61f76716567c2b75fc98c3363d30e2b028c349b:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index ac691feed7..185ea76d37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,8 @@ # Build the version number set(SIMGRID_VERSION_MAJOR "3") -set(SIMGRID_VERSION_MINOR "32") -set(SIMGRID_VERSION_PATCH "1") # odd => git branch; even => stable release or released snapshot +set(SIMGRID_VERSION_MINOR "34") +set(SIMGRID_VERSION_PATCH "0") # odd => git branch; even => stable release or released snapshot if(${SIMGRID_VERSION_PATCH} EQUAL "0") set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}") @@ -475,7 +475,7 @@ else() endif() endif() # If the test ran well, remove the test binary -file(REMOVE test_stackgrowth) +file(REMOVE ${CMAKE_BINARY_DIR}/test_stackgrowth) #-------------------------------------------------------------------------------------------------- ############### @@ -755,6 +755,8 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES add_custom_target(tests COMMENT "Recompiling the tests") add_custom_target(tests-mc COMMENT "Recompiling the MC tests and tools.") add_dependencies(tests tests-mc) +add_custom_target(tests-ns3 COMMENT "Recompiling the ns3 tests and tools.") +add_dependencies(tests tests-ns3) ### Build some Maintainer files include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MaintainerMode.cmake) @@ -953,7 +955,7 @@ message(" Documentation ...............: ${enable_documentation}") message(" Graphviz mode ...............: ${HAVE_GRAPHVIZ}") message(" Mallocators .................: ${enable_mallocators}") message("") -message(" Simgrid dependencies ........: ${SIMGRID_DEP}") +message(" SimGrid dependencies ........: ${SIMGRID_DEP}") message("") execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/Testing/Notes/)