X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e91f26820b30a2d87b4c723e92eaebbd2dc5ce15..498f97c6a9dba4c63ba605da7c7df669bffa96bf:/tools/cmake/Distrib.cmake

diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake
index 8d871e31c9..50952960ff 100644
--- a/tools/cmake/Distrib.cmake
+++ b/tools/cmake/Distrib.cmake
@@ -25,14 +25,6 @@ endif()
 
 install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh DESTINATION ${CMAKE_INSTALL_BINDIR}/)
 
-install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl
-  DESTINATION ${CMAKE_INSTALL_BINDIR}/
-  RENAME simgrid-colorizer)
-
-add_custom_target(simgrid-colorizer ALL
-  COMMENT "Install ${CMAKE_BINARY_DIR}/bin/colorize"
-  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl ${CMAKE_BINARY_DIR}/bin/colorize)
-
 install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl
   DESTINATION ${CMAKE_INSTALL_BINDIR}/
   RENAME simgrid_update_xml)
@@ -51,13 +43,8 @@ add_custom_target(simgrid_convert_TI_traces ALL
 
 # libraries
 install(TARGETS simgrid DESTINATION ${CMAKE_INSTALL_LIBDIR}/)
-
-if(enable_java)
-  set(SIMGRID_JAR_TO_INSTALL "${SIMGRID_JAR}")
-  install(TARGETS simgrid-java DESTINATION ${CMAKE_INSTALL_LIBDIR}/)
-  install(FILES ${SIMGRID_JAR_TO_INSTALL}
-      DESTINATION java/
-      RENAME simgrid.jar)
+if("${CMAKE_SYSTEM}" MATCHES "Linux")
+  install(TARGETS sthread DESTINATION ${CMAKE_INSTALL_LIBDIR}/)
 endif()
 
 # pkg-config files
@@ -94,20 +81,16 @@ endforeach(file ${examples_to_install})
 set(source_to_pack
   ${headers_to_install}
   ${source_of_generated_headers}
-  ${JMSG_C_SRC}
-  ${JMSG_JAVA_SRC}
   ${MC_SRC_BASE}
   ${MC_SRC}
   ${MC_SIMGRID_MC_SRC}
-  ${MSG_SRC}
   ${S4U_SRC}
   ${NS3_SRC}
   ${PLUGINS_SRC}
   ${DAG_SRC}
   ${SIMGRID_SRC}
-  ${SIMIX_SRC}
   ${SMPI_SRC}
-  ${SURF_SRC}
+  ${KERNEL_SRC}
   ${TRACING_SRC}
   ${XBT_RL_SRC}
   ${XBT_SRC}
@@ -115,7 +98,6 @@ set(source_to_pack
   ${EXTRA_DIST}
   ${CMAKE_SOURCE_FILES}
   ${CMAKEFILES_TXT}
-  ${DOC_IMG}
   ${DOC_SOURCES}
   ${DOC_TOOLS}
   ${PLATFORMS_EXAMPLES}
@@ -225,14 +207,6 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/)
 add_dependencies(dist dist-dir)
 
-if(NOT enable_maintainer_mode)
-  add_custom_target(echo-dist
-    COMMAND ${CMAKE_COMMAND} -E echo "WARNING: ----------------------------------------------------"
-    COMMAND ${CMAKE_COMMAND} -E echo "WARNING: Distrib is generated without option maintainer mode "
-    COMMAND ${CMAKE_COMMAND} -E echo "WARNING: ----------------------------------------------------")
-  add_dependencies(dist echo-dist)
-endif()
-
 ###########################################
 ### Fill in the "make distcheck" target ###
 ###########################################
@@ -240,10 +214,13 @@ endif()
 set(CMAKE_BINARY_TEST_DIR ${CMAKE_BINARY_DIR})
 
 # Allow to test the "make dist"
-add_custom_target(distcheck
+add_custom_target(distcheck-archive
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Compare archive with git repository"
   COMMAND ${CMAKE_HOME_DIRECTORY}/tools/internal/check_dist_archive -batch ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}.tar.gz
+  )
+add_dependencies(distcheck-archive dist)
 
+add_custom_target(distcheck-configure
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Remove old copy"
   COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}
 
@@ -260,7 +237,10 @@ add_custom_target(distcheck
 
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Check generated files -- please copy new version if they are different"
   COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/MANIFEST.in ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build/MANIFEST.in
+  )
+add_dependencies(distcheck-configure distcheck-archive)
 
+add_custom_target(distcheck
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Build"
   COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ${CMAKE_MAKE_PROGRAM} -j 4
 
@@ -276,7 +256,7 @@ add_custom_target(distcheck
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Remove temp directories"
   COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}
   )
-add_dependencies(distcheck dist)
+add_dependencies(distcheck distcheck-configure)
 
 #######################################
 ### Fill in the "make check" target ###