kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fix the Java test for Visual Studio builds. Before this, it had been trying to include "BuildLog.htm" in the .jar file because it was using "." as the list of files to include in the .jar file. Use "*.class" instead of "." to prevent this silliness.

This commit is contained in:
David Cole 2008-03-13 14:29:26 -04:00
parent fb0296656d
commit 4cd5a8a690
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/CMakeJavaInformation.cmake
View File

@ -15,10 +15,11 @@ ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX)
# this is a place holder if java needed flags for javac they would go here. # this is a place holder if java needed flags for javac they would go here.
IF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY) IF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY)
SET(CMAKE_Java_CREATE_STATIC_LIBRARY SET(CMAKE_Java_CREATE_STATIC_LIBRARY
"<CMAKE_Java_ARCHIVE> -cf <TARGET> -C <OBJECT_DIR> .") "<CMAKE_Java_ARCHIVE> -cf <TARGET> -C <OBJECT_DIR> *.class")
# should be this <OBJECTS> but compling a java file can create more than one .class file # "*.class" should really be "<OBJECTS>" but compling a java file can create
# so for now get all of them # more than one .class file, so for now get all of them
ENDIF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY) ENDIF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY)
# compile a Java file into an object file # compile a Java file into an object file
IF(NOT CMAKE_Java_COMPILE_OBJECT) IF(NOT CMAKE_Java_COMPILE_OBJECT)
SET(CMAKE_Java_COMPILE_OBJECT SET(CMAKE_Java_COMPILE_OBJECT