diff options
| author | David Cole <david.cole@kitware.com> | 2008-03-13 18:29:26 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2008-03-13 18:29:26 (GMT) |
| commit | 4cd5a8a69030151596d28c3a54fee60eef789f1b (patch) | |
| tree | 504b2cb08ded18c48d3cb02809904786836e0d91 | |
| parent | fb0296656d4d332b95e50982335231d1b49da3f7 (diff) | |
| download | CMake-4cd5a8a69030151596d28c3a54fee60eef789f1b.zip CMake-4cd5a8a69030151596d28c3a54fee60eef789f1b.tar.gz CMake-4cd5a8a69030151596d28c3a54fee60eef789f1b.tar.bz2 | |
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.
| -rw-r--r-- | Modules/CMakeJavaInformation.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/CMakeJavaInformation.cmake b/Modules/CMakeJavaInformation.cmake index c73b7e8..76b09e6 100644 --- a/Modules/CMakeJavaInformation.cmake +++ b/Modules/CMakeJavaInformation.cmake @@ -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. IF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY) SET(CMAKE_Java_CREATE_STATIC_LIBRARY - "<CMAKE_Java_ARCHIVE> -cf <TARGET> -C <OBJECT_DIR> .") -# should be this <OBJECTS> but compling a java file can create more than one .class file -# so for now get all of them + "<CMAKE_Java_ARCHIVE> -cf <TARGET> -C <OBJECT_DIR> *.class") + # "*.class" should really be "<OBJECTS>" but compling a java file can create + # more than one .class file, so for now get all of them ENDIF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY) + # compile a Java file into an object file IF(NOT CMAKE_Java_COMPILE_OBJECT) SET(CMAKE_Java_COMPILE_OBJECT |