From 00ac695da387feab357e3fae074c62396be1fe64 Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 27 Apr 2010 10:47:20 +0000 Subject: [PATCH] Add version for libs and release. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7648 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- CMakeLists.txt | 7 +++++-- buildtools/Cmake/src/CMakeDistrib.txt | 2 +- buildtools/Cmake/src/CMakeMakeExeLib.txt | 4 +++- buildtools/Cmake/src/CMakePrintArgs.txt | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fddeef376..01e7aae9c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,11 @@ exec_program("rm ${Project_BINARY_DIR}/CTestTestfile.cmake" OUTPUT_VARIABLE rmok SET(CMAKE_LANGUAGE "Cxx") SET(PROJECT_NAME "Simgrid") SET(PROJECT_LABEL "Simgrid") -set(simgrid_version "3.4") -set(USE_RPATH false) + +set(release_version "3.4") +set(libsimgrid_version "${release_version}") +set(libgras_version "${release_version}") +set(libsmpi_version "${release_version}") ### Find programs and paths find_program(SH_EXE NAMES sh) diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt index 76ba352c76..1c3c1391ee 100755 --- a/buildtools/Cmake/src/CMakeDistrib.txt +++ b/buildtools/Cmake/src/CMakeDistrib.txt @@ -1,7 +1,7 @@ set(CMAKE_PROJECT_NAME "${PROJECT_NAME}") set(CPACK_PACKAGE_NAME "${PROJECT_NAME}") set(CPACK_PROJECT_NAME "${PROJECT_NAME}") -set(CPACK_PACKAGE_FILE_NAME "simgrid-${simgrid_version}~${SVN_VERSION}") +set(CPACK_PACKAGE_FILE_NAME "simgrid-${release_version}~${SVN_VERSION}") set(CPACK_GENERATOR "TBZ2") #;TGZ;TZ;ZIP foreach(file ${script_to_install}) diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt index e85e0c968a..d22d33d985 100644 --- a/buildtools/Cmake/src/CMakeMakeExeLib.txt +++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt @@ -9,7 +9,9 @@ else(enable_supernovae) add_library(smpi SHARED ${SMPI_SRC}) endif(enable_supernovae) -set_target_properties(simgrid gras smpi PROPERTIES VERSION ${simgrid_version}) +set_target_properties(simgrid PROPERTIES VERSION ${libsimgrid_version}) +set_target_properties(gras PROPERTIES VERSION ${libgras_version}) +set_target_properties(smpi PROPERTIES VERSION ${libsmpi_version}) set(GRAS_DEP "-lm -lpthread") set(SIMGRID_DEP "-lm") diff --git a/buildtools/Cmake/src/CMakePrintArgs.txt b/buildtools/Cmake/src/CMakePrintArgs.txt index c8d08b328a..0e80f83b12 100644 --- a/buildtools/Cmake/src/CMakePrintArgs.txt +++ b/buildtools/Cmake/src/CMakePrintArgs.txt @@ -83,7 +83,7 @@ endif(enable_print_message) message("\nConfiguration of package `simgrid' (revision ${SVN_VERSION}) on arch (=${GRAS_THISARCH}):") message(" BUILDNAME : ${BUILDNAME}") message(" SITE : ${SITE}") -message(" Release : simgrid-${simgrid_version}~rev${SVN_VERSION}") +message(" Release : simgrid-${release_version}~rev${SVN_VERSION}") message("") message(" Compiler: c++ : ${CMAKE_CXX_COMPILER}") message(" version: ${COMPILER_CXX_VERSION}") -- 2.20.1