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
Add an option to control whether native libraries are bundled into jar file.
[simgrid.git]
/
buildtools
/
Cmake
/
Distrib.cmake
diff --git
a/buildtools/Cmake/Distrib.cmake
b/buildtools/Cmake/Distrib.cmake
index
9b9b00a
..
74b539b
100644
(file)
--- a/
buildtools/Cmake/Distrib.cmake
+++ b/
buildtools/Cmake/Distrib.cmake
@@
-78,10
+78,16
@@
if(enable_lib_static AND NOT WIN32)
endif()
if(enable_java)
endif()
if(enable_java)
+ if(enable_lib_in_jar)
+ set(SIMGRID_JAR_TO_INSTALL "${SIMGRID_FULL_JAR}")
+ else()
+ set(SIMGRID_JAR_TO_INSTALL "${SIMGRID_JAR}")
+ endif()
install(TARGETS simgrid-java
DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
install(TARGETS simgrid-java
DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
- install(FILES ${SIMGRID_JAR}
- DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/)
+ install(FILES ${SIMGRID_JAR_TO_INSTALL}
+ DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/
+ RENAME simgrid.jar)
endif()
# include files
endif()
# include files
@@
-260,6
+266,7
@@
endforeach(file ${source_to_pack})
add_custom_command(
TARGET dist-dir
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile
add_custom_command(
TARGET dist-dir
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile
+ COMMAND ${CMAKE_COMMAND} -E echo "${GIT_VERSION}" > ${PROJECT_NAME}-${release_version}/.gitversion
)
######################################
)
######################################
@@
-374,11
+381,4
@@
add_custom_target(maintainer-clean
WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
)
WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
)
-add_custom_target(supernovae-clean
- COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_sg.c
- COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_smpi.c
- WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
- )
-
-
include(CPack)
include(CPack)