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

COMP: Conditionalize the last change so that the fix only applies to WIN32. Leave it the way it was elsewhere, the new way does not work on the Mac continuous dashboard...

This commit is contained in:
David Cole 2008-03-13 15:03:20 -04:00
parent a313a098d0
commit 908a2b462d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/CMakeJavaInformation.cmake
View File

@ -14,16 +14,22 @@ 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)
IF(WIN32)
SET(class_files_mask "*.class")
ELSE(WIN32)
SET(class_files_mask ".")
ENDIF(WIN32)
SET(CMAKE_Java_CREATE_STATIC_LIBRARY SET(CMAKE_Java_CREATE_STATIC_LIBRARY
"<CMAKE_Java_ARCHIVE> -cf <TARGET> -C <OBJECT_DIR> *.class") "<CMAKE_Java_ARCHIVE> -cf <TARGET> -C <OBJECT_DIR> ${class_files_mask}")
# "*.class" should really be "<OBJECTS>" but compling a java file can create # "${class_files_mask}" should really be "<OBJECTS>" but compling a *.java
# more than one .class file, so for now get all of them # file can create more than one *.class file...
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
"<CMAKE_Java_COMPILER> <FLAGS> <SOURCE> -d <OBJECT_DIR>") "<CMAKE_Java_COMPILER> <FLAGS> <SOURCE> -d <OBJECT_DIR>")
ENDIF(NOT CMAKE_Java_COMPILE_OBJECT) ENDIF(NOT CMAKE_Java_COMPILE_OBJECT)
# set java include flag option and the separator for multiple include paths # set java include flag option and the separator for multiple include paths