X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/70cd2a962ed89faa53e5ef0d3eaaf5e5b508b2c7..82ef1f08a953fa19e307b0efec73caedb3b960c5:/tools/cmake/Distrib.cmake diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake index 30f44e9faa..5e4d31dcd4 100644 --- a/tools/cmake/Distrib.cmake +++ b/tools/cmake/Distrib.cmake @@ -52,11 +52,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 +81,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 ### ########################################### @@ -179,6 +157,7 @@ set(source_to_pack ${MC_SRC} ${MC_SIMGRID_MC_SRC} ${MSG_SRC} + ${S4U_SRC} ${NS3_SRC} ${RNGSTREAM_SRC} ${SIMDAG_SRC}