X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7da2926d0733ff0683f31aeea176ce71e127264f..25829dc9295bf70044f3bb3c46e6c253ed378fe1:/tools/cmake/Distrib.cmake diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake index afa1426061..8f5338d9cc 100644 --- a/tools/cmake/Distrib.cmake +++ b/tools/cmake/Distrib.cmake @@ -6,8 +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/) # binaries if(enable_smpi) @@ -52,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 @@ -86,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 ### ########################################### @@ -251,7 +227,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 ) @@ -364,18 +339,4 @@ add_custom_target(maintainer-clean WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}" ) -if(WIN32) - find_program(NSIS_PROGRAM NAMES makensi) - message(STATUS "nsis: ${NSIS_PROGRAM}") - - if(NSIS_PROGRAM) - ADD_CUSTOM_TARGET(nsis - COMMENT "Generating the SimGrid installer for Windows..." - DEPENDS simgrid simgrid graphicator simgrid-colorizer simgrid_update_xml - COMMAND ${NSIS_PROGRAM} simgrid.nsi - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/ - ) - endif() -endif() - include(CPack)