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
JSURF_JAVA_GENERATED_SRC is already included in JMSG_JAVA_SRC
[simgrid.git]
/
buildtools
/
Cmake
/
MakeJava.cmake
diff --git
a/buildtools/Cmake/MakeJava.cmake
b/buildtools/Cmake/MakeJava.cmake
index 7e0d62cf8e4210a1778665f0d702e7171617a99e..8a34726ab2c3932aa6e8ea11b2641125c84ee009 100644
(file)
--- a/
buildtools/Cmake/MakeJava.cmake
+++ b/
buildtools/Cmake/MakeJava.cmake
@@
-78,9
+78,9
@@
endif()
##
if(CMAKE_VERSION VERSION_LESS "2.8.12")
set(CMAKE_JAVA_TARGET_OUTPUT_NAME simgrid)
##
if(CMAKE_VERSION VERSION_LESS "2.8.12")
set(CMAKE_JAVA_TARGET_OUTPUT_NAME simgrid)
- add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC}
${JSURF_JAVA_GENERATED_SRC}
)
+ add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC})
else()
else()
- add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC}
${JSURF_JAVA_GENERATED_SRC}
OUTPUT_NAME simgrid)
+ add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC} OUTPUT_NAME simgrid)
endif()
set(JAVA_BUNDLE "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/java_bundle.sh")
endif()
set(JAVA_BUNDLE "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/java_bundle.sh")