X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a37684dd40935e1c18856a7f77f8d1a2caeb2875..bd0d32d80b6162bd2888f98fe0cb1c9beaf9f6f7:/buildtools/Cmake/Distrib.cmake diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index 2e277a8116..e213f97d00 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -20,17 +20,10 @@ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc ${CMAKE_BINARY_DIR}/bin/smpiff ${CMAKE_BINARY_DIR}/bin/smpirun DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/) -if(WIN32) - install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl - DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/ - RENAME tesh) - add_custom_target(tesh - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh - ) -else(WIN32) - install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh - DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/) -endif(WIN32) + +install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh +DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/) + install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/ @@ -96,10 +89,6 @@ foreach(file ${README_examples_files}) endforeach(file ${README_examples_files}) # bindings cruft -if(HAVE_JAVA) - install(FILES ${CMAKE_BINARY_DIR}/simgrid.jar - DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/) -endif(HAVE_JAVA) if(HAVE_LUA) file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/lib/lua/5.1") @@ -171,14 +160,6 @@ COMMAND ${CMAKE_COMMAND} -E echo "uninstall include ok" WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}" ) -if(HAVE_JAVA) - add_custom_command(TARGET uninstall - COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/share/simgrid.jar - COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding java ok" - WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}/" - ) -endif(HAVE_JAVA) - if(HAVE_LUA) add_custom_command(TARGET uninstall COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding lua ok"