X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/86ef93540872830ed4c8a5737678f6eb528d021d..77c0face3a66d71cb73f4c5444d0c45bf3bb6aa1:/tools/cmake/Distrib.cmake diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake index 8cdd973b1f..72d8a98642 100644 --- a/tools/cmake/Distrib.cmake +++ b/tools/cmake/Distrib.cmake @@ -3,7 +3,7 @@ ######################################### # doc -install(DIRECTORY "${CMAKE_BINARY_DIR}/doc/html/" DESTINATION doc/simgrid/html/ OPTIONAL) +install(DIRECTORY "${CMAKE_BINARY_DIR}/doc/html/" DESTINATION ${CMAKE_INSTALL_DOCDIR}/html/ OPTIONAL) # binaries if(enable_smpi) @@ -11,22 +11,22 @@ if(enable_smpi) ${CMAKE_BINARY_DIR}/bin/smpicc ${CMAKE_BINARY_DIR}/bin/smpicxx ${CMAKE_BINARY_DIR}/bin/smpirun - DESTINATION bin/) + DESTINATION ${CMAKE_INSTALL_BINDIR}/) if(SMPI_FORTRAN) install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpif90 ${CMAKE_BINARY_DIR}/bin/smpiff - DESTINATION bin/) + DESTINATION ${CMAKE_INSTALL_BINDIR}/) install(PROGRAMS ${CMAKE_BINARY_DIR}/include/smpi/mpi.mod - DESTINATION include/smpi/) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/smpi/) endif() endif() -install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh DESTINATION bin/) +install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh DESTINATION ${CMAKE_INSTALL_BINDIR}/) install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl - DESTINATION bin/ + DESTINATION ${CMAKE_INSTALL_BINDIR}/ RENAME simgrid-colorizer) add_custom_target(simgrid-colorizer ALL @@ -34,7 +34,7 @@ add_custom_target(simgrid-colorizer ALL 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 bin/ + DESTINATION ${CMAKE_INSTALL_BINDIR}/ RENAME simgrid_update_xml) add_custom_target(simgrid_update_xml ALL @@ -42,7 +42,7 @@ add_custom_target(simgrid_update_xml ALL COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml) install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/simgrid_convert_TI_traces.py - DESTINATION bin/ + DESTINATION ${CMAKE_INSTALL_BINDIR}/ RENAME simgrid_convert_TI_traces) add_custom_target(simgrid_convert_TI_traces ALL @@ -50,11 +50,11 @@ add_custom_target(simgrid_convert_TI_traces ALL COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/simgrid_convert_TI_traces.py ${CMAKE_BINARY_DIR}/bin/simgrid_convert_TI_traces) # libraries -install(TARGETS simgrid DESTINATION lib/) +install(TARGETS simgrid DESTINATION ${CMAKE_INSTALL_LIBDIR}/) if(enable_java) set(SIMGRID_JAR_TO_INSTALL "${SIMGRID_JAR}") - install(TARGETS simgrid-java DESTINATION lib/) + install(TARGETS simgrid-java DESTINATION ${CMAKE_INSTALL_LIBDIR}/) install(FILES ${SIMGRID_JAR_TO_INSTALL} DESTINATION java/ RENAME simgrid.jar) @@ -63,21 +63,25 @@ endif() # pkg-config files configure_file("${CMAKE_HOME_DIRECTORY}/tools/pkg-config/simgrid.pc.in" "${PROJECT_BINARY_DIR}/simgrid.pc" @ONLY) -install(FILES "${PROJECT_BINARY_DIR}/simgrid.pc" DESTINATION lib/pkgconfig/) +install(FILES "${PROJECT_BINARY_DIR}/simgrid.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/) # include files -foreach(file ${headers_to_install} ${generated_headers_to_install}) +foreach(file ${headers_to_install} ${generated_headers_to_install}) get_filename_component(location ${file} PATH) string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" location "${location}") - install(FILES ${file} DESTINATION ${location}) + string(REGEX REPLACE "^include/" "" location "${location}") + string(REGEX REPLACE "^include$" "" location "${location}") + # message("installing '${file}' into '${CMAKE_INSTALL_INCLUDEDIR}/${location}'") + install(FILES ${file} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${location}) endforeach() # example files foreach(file ${examples_to_install}) string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/examples/" "" file ${file}) get_filename_component(location ${file} PATH) + # message("DOC installing 'examples/${file}' into '${CMAKE_INSTALL_DOCDIR}/examples/${location}'") install(FILES "examples/${file}" - DESTINATION doc/simgrid/examples/${location}) + DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples/${location}) endforeach(file ${examples_to_install}) ########################################### @@ -135,7 +139,7 @@ endif() ################################################################ ## Build a sain "make dist" target to build a source package ### -## containing only the files that I explicitely state ### +## containing only the files that I explicitly state ### ## (instead of any cruft laying on my disk as CPack does) ### ################################################################ @@ -155,7 +159,6 @@ set(source_to_pack ${S4U_SRC} ${NS3_SRC} ${PLUGINS_SRC} - ${RNGSTREAM_SRC} ${SIMDAG_SRC} ${SIMGRID_SRC} ${SIMIX_SRC} @@ -181,6 +184,8 @@ set(source_to_pack ${txt_files} ${xml_files} ) +list(SORT source_to_pack) +list(REMOVE_DUPLICATES source_to_pack) ########################################## ### Fill in the "make dist-dir" target ### @@ -201,7 +206,7 @@ foreach(file ${source_to_pack}) #message(${file}) # This damn prefix is still set somewhere (seems to be in subdirs) string(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" file "${file}") - + # Prepare the list of files to include in the python sdist, one per line set(PYTHON_SOURCES "${PYTHON_SOURCES}\ninclude ${file}") @@ -293,23 +298,26 @@ set(CMAKE_BINARY_TEST_DIR ${CMAKE_BINARY_DIR}) # Allow to test the "make dist" add_custom_target(distcheck - COMMAND ${CMAKE_COMMAND} -E echo "XXX compare archive with git repository" + 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 - COMMAND ${CMAKE_COMMAND} -E echo "XXX remove old copy" + COMMAND ${CMAKE_COMMAND} -E echo "XXX Remove old copy" COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version} COMMAND ${CMAKE_COMMAND} -E echo "XXX Untar distrib" - COMMAND ${CMAKE_COMMAND} -E tar xf ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}.tar.gz ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version} + COMMAND ${CMAKE_COMMAND} -E tar xf ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}.tar.gz - COMMAND ${CMAKE_COMMAND} -E echo "XXX create build and install subtrees" + COMMAND ${CMAKE_COMMAND} -E echo "XXX Create build and install subtrees" COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_inst COMMAND ${CMAKE_COMMAND} -E echo "XXX Configure" COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_inst -Denable_lto=OFF .. - + + 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 + 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