Install the libraries carefully so that we have a link from .so to .so.version

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

diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index 3925e87..a4c6ac7 100755 (executable)
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -349,19 +349,6 @@ ${PROJECT_DIRECTORY}/tools/gras/gras_stub_generator
 ${PROJECT_DIRECTORY}/tools/tesh/tesh
 )
 
 ${PROJECT_DIRECTORY}/tools/tesh/tesh
 )
 

-set(install_libs
-${PROJECT_DIRECTORY}/src/.libs/libsimgrid.*
-${PROJECT_DIRECTORY}/src/.libs/libsimgrid_static.*
-${PROJECT_DIRECTORY}/src/.libs/libgras.*
-)
-
-if(enable_smpi)
-       set(install_libs
-       ${install_libs}
-       ${PROJECT_DIRECTORY}/src/.libs/libsmpi.*
-       )
-endif(enable_smpi)
-

 set(install_HEADERS
 ./include/gras.h 
 ./include/xbt.h
 set(install_HEADERS
 ./include/gras.h 
 ./include/xbt.h

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index 2d690a6..35b5fe9 100755 (executable)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -52,6 +52,8 @@ string(REPLACE "./" "${prefix}/" uninstall_HEADERS "${install_HEADERS}")
 
 
 
 
 
 

+#SET(CMAKE_VERBOSE_MAKEFILE 1)
+

 add_custom_target(install-simgrid
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/bin
 add_custom_target(install-simgrid
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/bin


@@ -73,7 +75,19 @@ COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/instr
 COMMAND cp ${install_bins} $ENV{DESTDIR}${prefix}/bin
 COMMAND cp ${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl $ENV{DESTDIR}${prefix}/bin/simgrid-colorizer
 COMMAND echo "install bin           OK"
 COMMAND cp ${install_bins} $ENV{DESTDIR}${prefix}/bin
 COMMAND cp ${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl $ENV{DESTDIR}${prefix}/bin/simgrid-colorizer
 COMMAND echo "install bin           OK"

-COMMAND cp ${install_libs} $ENV{DESTDIR}${prefix}/lib
+
+  COMMAND cp ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so.${release_version} $ENV{DESTDIR}${prefix}/lib
+  COMMAND ln -sf $ENV{DESTDIR}${prefix}/lib/libsimgrid.so.${release_version} $ENV{DESTDIR}${prefix}/lib/libsimgrid.so
+
+  COMMAND cp ${PROJECT_DIRECTORY}/src/.libs/libsimgrid_static.a $ENV{DESTDIR}${prefix}/lib/libsimgrid.a
+
+  COMMAND cp ${PROJECT_DIRECTORY}/src/.libs/libgras.so.${release_version} $ENV{DESTDIR}${prefix}/lib
+  COMMAND ln -sf $ENV{DESTDIR}${prefix}/lib/libgras.so.${release_version} $ENV{DESTDIR}${prefix}/lib/libgras.so
+
+  # FIXME: this should be copied only if enable_smpi is true
+  COMMAND cp ${PROJECT_DIRECTORY}/src/.libs/libsmpi.so.${release_version} $ENV{DESTDIR}${prefix}/lib || true
+  COMMAND ln -sf $ENV{DESTDIR}${prefix}/lib/libsmpi.so.${release_version} $ENV{DESTDIR}${prefix}/lib/libsmpi.so
+

 COMMAND echo "install lib           OK"
 WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 )
 COMMAND echo "install lib           OK"
 WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 )