X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1a22c6510db6fe1fb129ec871234c020b5989353..16a45e38a1e86f3ee02cf16c25766f6cb8f38b17:/buildtools/Cmake/Distrib.cmake?ds=sidebyside

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
old mode 100755
new mode 100644
index 9d1e57ee4d..53a488748f
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -5,16 +5,19 @@ 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/smpirun
@@ -35,21 +38,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})
@@ -216,6 +222,8 @@ 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 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/
 )
 
 set(dirs_in_tarball "")