From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 23 Dec 2015 10:11:16 +0000 (+0100)
Subject: [cmake] fix outoftree build for Java
X-Git-Tag: v3_13~1395
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a2f39416ee822838ae414f40fc623c8feb7c6730

[cmake] fix outoftree build for Java

And don't include the outdated ChangeLog.java anymore
---

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index b02be32537..bd77876cba 100644
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -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
   )
 
 ###