Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
[cmake] fix outoftree build for Java
authorMartin Quinson <martin.quinson@loria.fr>
Wed, 23 Dec 2015 10:11:16 +0000 (11:11 +0100)
committerMartin Quinson <martin.quinson@loria.fr>
Wed, 23 Dec 2015 10:11:23 +0000 (11:11 +0100)
And don't include the outdated ChangeLog.java anymore

tools/cmake/Java.cmake

index b02be32..bd77876 100644 (file)
@@ -90,7 +90,8 @@ add_custom_command(
 
   COMMAND ${Java_JAVADOC_EXECUTABLE} -quiet -d doc/javadoc -sourcepath ${CMAKE_HOME_DIRECTORY}/src/bindings/java/ org.simgrid.msg org.simgrid.trace
   
-  COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} doc/javadoc -C ${CMAKE_HOME_DIRECTORY} COPYING ChangeLog ChangeLog.SimGrid-java LICENSE-LGPL-2.1 NEWS
+  COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} doc/javadoc
+  COMMAND ${JAVA_ARCHIVE} -uvf  ${SIMGRID_JAR} -C ${CMAKE_HOME_DIRECTORY} COPYING -C ${CMAKE_HOME_DIRECTORY} ChangeLog -C ${CMAKE_HOME_DIRECTORY} LICENSE-LGPL-2.1 -C ${CMAKE_HOME_DIRECTORY} NEWS
   )
 
 ###