From 4cd5a8a69030151596d28c3a54fee60eef789f1b Mon Sep 17 00:00:00 2001 From: David Cole Date: Thu, 13 Mar 2008 14:29:26 -0400 Subject: [PATCH] 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. --- Modules/CMakeJavaInformation.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Modules/CMakeJavaInformation.cmake b/Modules/CMakeJavaInformation.cmake index c73b7e84d..76b09e6bd 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 - " -cf -C .") -# should be this but compling a java file can create more than one .class file -# so for now get all of them + " -cf -C *.class") + # "*.class" should really be "" 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