From df1ac93ee121b5cd14266476b07273c95a38a23c Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Thu, 26 Jun 2014 17:09:30 +0200 Subject: [PATCH] JSURF_JAVA_GENERATED_SRC is already included in JMSG_JAVA_SRC Some architectures complain and fail build if duplicated files are found --- buildtools/Cmake/MakeJava.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake index 7e0d62cf8e..8a34726ab2 100644 --- 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) - add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC} ${JSURF_JAVA_GENERATED_SRC}) + add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC}) 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") -- 2.20.1