diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-04-17 18:01:22 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-04-17 18:01:22 (GMT) |
commit | 5ecfd3d4d332e616605a75a273921b01437cb08f (patch) | |
tree | 9deb4e3debb729a631251a2935fc77fc3f9e4f59 /Modules/CMakeJavaInformation.cmake | |
parent | 0f8603acc2f007e68a1c41a48919fd1acfc41c20 (diff) | |
download | CMake-5ecfd3d4d332e616605a75a273921b01437cb08f.zip CMake-5ecfd3d4d332e616605a75a273921b01437cb08f.tar.gz CMake-5ecfd3d4d332e616605a75a273921b01437cb08f.tar.bz2 |
ENH: fix java and add OBJECT_DIR support
Diffstat (limited to 'Modules/CMakeJavaInformation.cmake')
-rw-r--r-- | Modules/CMakeJavaInformation.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeJavaInformation.cmake b/Modules/CMakeJavaInformation.cmake index d7692bc..c73b7e8 100644 --- a/Modules/CMakeJavaInformation.cmake +++ b/Modules/CMakeJavaInformation.cmake @@ -15,14 +15,14 @@ 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> *.class") + "<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 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 - "<CMAKE_Java_COMPILER> <FLAGS> <SOURCE> -d <CMAKE_CURRENT_BINARY_DIR>") + "<CMAKE_Java_COMPILER> <FLAGS> <SOURCE> -d <OBJECT_DIR>") ENDIF(NOT CMAKE_Java_COMPILE_OBJECT) # set java include flag option and the separator for multiple include paths |