Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
JSURF_JAVA_GENERATED_SRC is already included in JMSG_JAVA_SRC
authorAugustin Degomme <augustin.degomme@imag.fr>
Thu, 26 Jun 2014 15:09:30 +0000 (17:09 +0200)
committerAugustin Degomme <augustin.degomme@imag.fr>
Thu, 26 Jun 2014 15:09:30 +0000 (17:09 +0200)
Some architectures complain and fail build if duplicated files are found

buildtools/Cmake/MakeJava.cmake

index 7e0d62c..8a34726 100644 (file)
@@ -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")