From a2f39416ee822838ae414f40fc623c8feb7c6730 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 23 Dec 2015 11:11:16 +0100 Subject: [PATCH] [cmake] fix outoftree build for Java And don't include the outdated ChangeLog.java anymore --- tools/cmake/Java.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 ) ### -- 2.20.1