valgrind version checking rule did not match 3.10.0

[simgrid.git] / tools / cmake / Distrib.cmake

diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake
index 77d2dd7..865cc32 100644 (file)
--- 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
@@ -179,6 +174,7 @@ set(source_to_pack
   ${MC_SRC}
   ${MC_SIMGRID_MC_SRC}
   ${MSG_SRC}
+  ${S4U_SRC}
   ${NS3_SRC}
   ${RNGSTREAM_SRC}
   ${SIMDAG_SRC}
@@ -363,18 +359,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)