A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't commit my personal eclipse settings
[simgrid.git]
/
tools
/
cmake
/
Distrib.cmake
diff --git
a/tools/cmake/Distrib.cmake
b/tools/cmake/Distrib.cmake
index
77d2dd7
..
6a2a461
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/)
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
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}
${MC_SRC}
${MC_SIMGRID_MC_SRC}
${MSG_SRC}
+ ${S4U_SRC}
${NS3_SRC}
${RNGSTREAM_SRC}
${SIMDAG_SRC}
${NS3_SRC}
${RNGSTREAM_SRC}
${SIMDAG_SRC}
@@
-364,9
+360,6
@@
add_custom_target(maintainer-clean
)
if(WIN32)
)
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..."
if(NSIS_PROGRAM)
ADD_CUSTOM_TARGET(nsis
COMMENT "Generating the SimGrid installer for Windows..."