Add version to shared lib and full path for sources.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7613 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f889b7f..d99e80d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 2.6)
 SET(CMAKE_LANGUAGE "Cxx")
 SET(PROJECT_NAME "Simgrid")
 cmake_minimum_required(VERSION 2.6)
 SET(CMAKE_LANGUAGE "Cxx")
 SET(PROJECT_NAME "Simgrid")

+set(simgrid_version "3.4")
+
+set(USE_RPATH false)

 
 ### Find programs and paths
 find_program(SH_EXE NAMES sh)
 
 ### 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 ab7e562..20db09f 100755 (executable)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -1,5 +1,3 @@
-set(simgrid_version "3.4")
-

 set(CMAKE_PROJECT_NAME "${PROJECT_NAME}")
 set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
 set(CPACK_PROJECT_NAME "${PROJECT_NAME}")
 set(CMAKE_PROJECT_NAME "${PROJECT_NAME}")
 set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
 set(CPACK_PROJECT_NAME "${PROJECT_NAME}")

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 42111c1..e85e0c9 100644 (file)
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -6,9 +6,11 @@ else(enable_supernovae)
        add_library(simgrid SHARED ${simgrid_sources})
        add_library(simgrid_static STATIC ${simgrid_sources})
        add_library(gras SHARED ${gras_sources})
        add_library(simgrid SHARED ${simgrid_sources})
        add_library(simgrid_static STATIC ${simgrid_sources})
        add_library(gras SHARED ${gras_sources})

-       add_library(smpi STATIC ${SMPI_SRC})
+       add_library(smpi SHARED ${SMPI_SRC})

 endif(enable_supernovae)
 
 endif(enable_supernovae)
 

+set_target_properties(simgrid gras smpi PROPERTIES VERSION ${simgrid_version})
+

 set(GRAS_DEP "-lm -lpthread")
 set(SIMGRID_DEP "-lm")
 set(SMPI_DEP "")
 set(GRAS_DEP "-lm -lpthread")
 set(SIMGRID_DEP "-lm")
 set(SMPI_DEP "")

diff --git a/buildtools/Cmake/src/CMakeSupernovae.txt b/buildtools/Cmake/src/CMakeSupernovae.txt
index 2475e2c..562cea6 100644 (file)
--- a/buildtools/Cmake/src/CMakeSupernovae.txt
+++ b/buildtools/Cmake/src/CMakeSupernovae.txt
@@ -63,4 +63,4 @@ exec_program("${PROJECT_DIRECTORY}/src/mk_supernovae.sh ${PROJECT_DIRECTORY}/src
 add_library(simgrid    SHARED  ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${simgrid_fragile_sources})
 add_library(simgrid_static STATIC ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${simgrid_fragile_sources})
 add_library(gras       SHARED  ${PROJECT_DIRECTORY}/src/supernovae_gras.c ${gras_fragile_sources})
 add_library(simgrid    SHARED  ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${simgrid_fragile_sources})
 add_library(simgrid_static STATIC ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${simgrid_fragile_sources})
 add_library(gras       SHARED  ${PROJECT_DIRECTORY}/src/supernovae_gras.c ${gras_fragile_sources})

-add_library(smpi       STATIC  ${PROJECT_DIRECTORY}/src/supernovae_smpi.c)
+add_library(smpi       SHARED  ${PROJECT_DIRECTORY}/src/supernovae_smpi.c)

diff --git a/tools/gras/CMakeLists.txt b/tools/gras/CMakeLists.txt
index 6f5604d..7642f90 100644 (file)
--- a/tools/gras/CMakeLists.txt
+++ b/tools/gras/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 
 set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/tools/gras/")
 
 
 set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/tools/gras/")
 

-add_executable(gras_stub_generator stub_generator.c unix_stub_generator.c windows_stub_generator.c)
+add_executable(gras_stub_generator ${PROJECT_DIRECTORY}/tools/gras/stub_generator.c ${PROJECT_DIRECTORY}/tools/gras/unix_stub_generator.c ${PROJECT_DIRECTORY}/tools/gras/windows_stub_generator.c)

 
 ### Add definitions for compile
 target_link_libraries(gras_stub_generator simgrid pthread m -fprofile-arcs)
 
 ### Add definitions for compile
 target_link_libraries(gras_stub_generator simgrid pthread m -fprofile-arcs)

diff --git a/tools/tesh/CMakeLists.txt b/tools/tesh/CMakeLists.txt
index 579f885..563f893 100644 (file)
--- a/tools/tesh/CMakeLists.txt
+++ b/tools/tesh/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 
 set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/tools/tesh/")
 
 
 set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/tools/tesh/")
 

-add_executable(tesh tesh.c run_context.c signal.c)
+add_executable(tesh ${PROJECT_DIRECTORY}/tools/tesh/tesh.c ${PROJECT_DIRECTORY}/tools/tesh/run_context.c ${PROJECT_DIRECTORY}/tools/tesh/signal.c)

 
 ### Add definitions for compile
 target_link_libraries(tesh gras m pthread -fprofile-arcs) 
 
 ### Add definitions for compile
 target_link_libraries(tesh gras m pthread -fprofile-arcs)