creating a static version of libsmpi version to link against HPL benchmark

[simgrid.git] / buildtools / Cmake / Distrib.cmake

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index 06d37d6..f22e55c 100755 (executable)
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -36,6 +36,9 @@ install(FILES ${CMAKE_BINARY_DIR}/lib/libsimgrid_static.a
 if(enable_smpi)        
   install(TARGETS smpi
           DESTINATION $ENV{DESTDIR}${prefix}/lib/)
+  install(FILES ${CMAKE_BINARY_DIR}/lib/libsmpi_static.a 
+        RENAME libsmpi.a
+        DESTINATION $ENV{DESTDIR}${prefix}/lib/)
 endif(enable_smpi)     
 
 # include files
@@ -61,7 +64,7 @@ endif(HAVE_JAVA)
 
 if(HAVE_LUA)
        file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/lib/lua/5.1")
-       add_custom_target(lua_simgrid ALL
+       add_custom_target(simgrid_lua ALL
                COMMAND ${CMAKE_COMMAND} -E create_symlink ../../libsimgrid.so ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.so
                DEPENDS simgrid
                )
@@ -175,7 +178,7 @@ add_custom_target(dist-dir
 )
 
 set(dirs_in_tarball "")
-foreach(file ${source_to_pack} ${txt_files})
+foreach(file ${source_to_pack})
   # This damn prefix is still set somewhere (seems to be in subdirs)
   string(REPLACE "${PROJECT_DIRECTORY}/" "" file ${file})
   
@@ -239,8 +242,8 @@ add_custom_target(distcheck
   COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/_build
   COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/_inst
   COMMAND diff -ruN simgrid-${release_version}.cpy simgrid-${release_version}
-#  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}.cpy 
-#  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/
+  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}.cpy 
+  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/
 )
 add_dependencies(distcheck dist-dir)