Fix error detection of f2c.

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

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index 9bb1571..753115d 100644 (file)
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -5,18 +5,23 @@ set(CMAKE_INSTALL_PREFIX "${prefix}" CACHE TYPE INTERNAL FORCE)
 #########################################
          
 # doc
-if(NOT EXISTS ${PROJECT_DIRECTORY}/doc/html/)
-       file(MAKE_DIRECTORY ${PROJECT_DIRECTORY}/doc/html/)
-endif(NOT EXISTS ${PROJECT_DIRECTORY}/doc/html/)
-       install(DIRECTORY "${PROJECT_DIRECTORY}/doc/html/"
-         DESTINATION "$ENV{DESTDIR}${prefix}/doc/simgrid/html/"
-         PATTERN ".svn" EXCLUDE 
-         PATTERN ".git" EXCLUDE 
-         PATTERN "*.o" EXCLUDE
-         PATTERN "*~" EXCLUDE
-       )
+if(enable_doc)
+       if(NOT EXISTS ${PROJECT_DIRECTORY}/doc/html/)
+               file(MAKE_DIRECTORY ${PROJECT_DIRECTORY}/doc/html/)
+       endif(NOT EXISTS ${PROJECT_DIRECTORY}/doc/html/)
+               install(DIRECTORY "${PROJECT_DIRECTORY}/doc/html/"
+                 DESTINATION "$ENV{DESTDIR}${prefix}/doc/simgrid/html/"
+                 PATTERN ".svn" EXCLUDE 
+                 PATTERN ".git" EXCLUDE 
+                 PATTERN "*.o" EXCLUDE
+                 PATTERN "*~" EXCLUDE
+               )
+endif(enable_doc)
+
 # binaries
 install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc
+                 ${CMAKE_BINARY_DIR}/bin/smpif2c
+                 ${CMAKE_BINARY_DIR}/bin/smpiff
                  ${CMAKE_BINARY_DIR}/bin/smpirun
                DESTINATION $ENV{DESTDIR}${prefix}/bin/)
 if(WIN32)
@@ -35,21 +40,24 @@ install(PROGRAMS tools/MSG_visualization/colorize.pl
 install(TARGETS simgrid gras 
         DESTINATION $ENV{DESTDIR}${prefix}/lib/)
        
-install(FILES ${CMAKE_BINARY_DIR}/lib/libsimgrid_static.a 
-        RENAME libsimgrid.a
-        DESTINATION $ENV{DESTDIR}${prefix}/lib/)
-       
 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)     
+endif(enable_smpi)
+
+if(enable_lib_static)
+       install(TARGETS simgrid_static 
+               DESTINATION $ENV{DESTDIR}${prefix}/lib/)
+       if(enable_smpi) 
+               install(TARGETS smpi_static
+                       DESTINATION $ENV{DESTDIR}${prefix}/lib/)
+       endif(enable_smpi)
+endif(enable_lib_static)
 
 # include files
 foreach(file ${install_HEADERS})
   get_filename_component(location ${file} PATH)
+  string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" location "${location}")
   install(FILES ${file}
           DESTINATION $ENV{DESTDIR}${prefix}/${location})
 endforeach(file ${install_HEADERS})
@@ -114,6 +122,8 @@ COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/lib/libsimgrid*
 COMMAND ${CMAKE_COMMAND} -E    remove -f ${prefix}/lib/libsmpi*
 COMMAND ${CMAKE_COMMAND} -E    echo "uninstall lib ok"
 COMMAND ${CMAKE_COMMAND} -E    remove -f ${prefix}/bin/smpicc
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${prefix}/bin/smpif2c
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${prefix}/bin/smpiff
 COMMAND ${CMAKE_COMMAND} -E    remove -f ${prefix}/bin/smpirun
 COMMAND ${CMAKE_COMMAND} -E    remove -f ${prefix}/bin/tesh
 COMMAND ${CMAKE_COMMAND} -E    remove -f ${prefix}/bin/simgrid-colorizer
@@ -145,7 +155,7 @@ endif(HAVE_JAVA)
 if(HAVE_LUA)
        add_custom_command(TARGET uninstall
        COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding lua ok"
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/lib/lua/5.1/simgrid.${LIB_EXE}  
+       COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/lib/lua/5.1/simgrid.${LIB_EXE}
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
        )
 endif(HAVE_LUA)
@@ -214,7 +224,7 @@ COMMAND ${CMAKE_COMMAND} -E echo "Make the html doc"
 
 add_custom_target(dist-dir
   COMMAND test -e simgrid-${release_version}/ && chmod -R a+w simgrid-${release_version}/ || true
-  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}
+  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/
   COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}
   COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/doc/html/
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_DIRECTORY}/doc/html/ simgrid-${release_version}/doc/html/
@@ -251,10 +261,10 @@ add_custom_target(dist
   DEPENDS ${CMAKE_BINARY_DIR}/simgrid-${release_version}.tar.gz
 )
 add_custom_command(
-       OUTPUT ${CMAKE_BINARY_DIR}/simgrid-${release_version}.tar.gz
+       OUTPUT ${CMAKE_BINARY_DIR}/simgrid-${release_version}.tar.gz    
        COMMAND ${CMAKE_COMMAND} -E tar cf simgrid-${release_version}.tar simgrid-${release_version}/
        COMMAND gzip -9v simgrid-${release_version}.tar
-       COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}
+       COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/
 )
 add_dependencies(dist dist-dir)