X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8695eb4cf63ff136fb246e39305887f3c7c334a8..bf30156c2370398b33f5c3e3a073265e7a3ef1de:/tools/cmake/Distrib.cmake?ds=sidebyside

diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake
index 9d3207f7eb..fbcc115929 100644
--- a/tools/cmake/Distrib.cmake
+++ b/tools/cmake/Distrib.cmake
@@ -6,31 +6,6 @@
 file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/html/)
 install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/html/"
   DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/html/)
-install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/HelloWorld/"
-  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/HelloWorld/)
-
-#### Generate the manpages
-if(NOT WIN32)
-  if( NOT MANPAGE_DIR)
-    set( MANPAGE_DIR ${CMAKE_BINARY_DIR}/manpages )
-  endif()
-
-  add_custom_target(manpages ALL
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${MANPAGE_DIR}
-    COMMAND pod2man ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl > ${MANPAGE_DIR}/simgrid_update_xml.1
-    COMMENT "Generating manpages"
-    )
-  install(FILES
-    ${MANPAGE_DIR}/simgrid_update_xml.1
-    ${CMAKE_HOME_DIRECTORY}/tools/tesh/tesh.1
-    ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpicc.1
-    ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpicxx.1
-    ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpif90.1
-    ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpiff.1
-    ${CMAKE_HOME_DIRECTORY}/doc/manpage/smpirun.1
-    DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/man/man1)
-
-endif()
 
 # binaries
 if(enable_smpi)
@@ -75,11 +50,6 @@ add_custom_target(simgrid_update_xml ALL
 install(TARGETS simgrid
   DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
 
-if(enable_lib_static AND NOT WIN32)
-  install(TARGETS simgrid_static
-    DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
-endif()
-
 if(enable_java)
   set(SIMGRID_JAR_TO_INSTALL "${SIMGRID_JAR}")
   install(TARGETS simgrid-java
@@ -109,23 +79,6 @@ foreach(file ${examples_to_install})
     DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/examples/${location})
 endforeach(file ${examples_to_install})
 
-# bindings cruft
-
-if(HAVE_LUA)
-  file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/lib/lua/5.1")
-  add_custom_target(simgrid_lua ALL
-    DEPENDS simgrid
-    ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
-    )
-  add_custom_command(
-    OUTPUT ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
-    COMMAND ${CMAKE_COMMAND} -E create_symlink ../../libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
-    )
-  install(FILES ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
-    DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/lua/5.1
-    )
-endif()
-
 ###########################################
 ### Fill in the "make uninstall" target ###
 ###########################################
@@ -202,6 +155,7 @@ set(source_to_pack
   ${MC_SRC}
   ${MC_SIMGRID_MC_SRC}
   ${MSG_SRC}
+  ${S4U_SRC}
   ${NS3_SRC}
   ${RNGSTREAM_SRC}
   ${SIMDAG_SRC}
@@ -214,9 +168,7 @@ set(source_to_pack
   ${XBT_SRC}
   ${EXTRA_DIST}
   ${CMAKE_SOURCE_FILES}
-  ${EXAMPLES_CMAKEFILES_TXT}
-  ${TESHSUITE_CMAKEFILES_TXT}
-  ${TOOLS_CMAKEFILES_TXT}
+  ${CMAKEFILES_TXT}
   ${DOC_FIGS}
   ${DOC_IMG}
   ${DOC_SOURCES}
@@ -273,7 +225,6 @@ endforeach(file ${source_to_pack})
 
 add_custom_command(
   TARGET dist-dir
-  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile
   COMMAND ${CMAKE_COMMAND} -E echo "${GIT_VERSION}" > ${PROJECT_NAME}-${release_version}/.gitversion
   )