summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2004-09-27 15:36:29 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2004-09-27 15:36:29 (GMT)
commit016e0e52cb758267f1af945b55d2ac5383f4e226 (patch)
tree92bdbec0c93b22a412663aab64587426c96378e2 /Modules
parentf5b978fe2f03c865549d4d0e3c9aebc8edc50288 (diff)
downloadCMake-016e0e52cb758267f1af945b55d2ac5383f4e226.zip
CMake-016e0e52cb758267f1af945b55d2ac5383f4e226.tar.gz
CMake-016e0e52cb758267f1af945b55d2ac5383f4e226.tar.bz2
BUG: make sure java jar files are not libfoo.jar but are just foo.jar
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CMakeJavaCompiler.cmake.in2
-rw-r--r--Modules/CMakeJavaInformation.cmake1
2 files changed, 2 insertions, 1 deletions
diff --git a/Modules/CMakeJavaCompiler.cmake.in b/Modules/CMakeJavaCompiler.cmake.in
index c0dc075..0c3eaf6 100644
--- a/Modules/CMakeJavaCompiler.cmake.in
+++ b/Modules/CMakeJavaCompiler.cmake.in
@@ -6,3 +6,5 @@ SET(CMAKE_Java_COMPILER_LOADED 1)
SET(CMAKE_Java_SOURCE_FILE_EXTENSIONS java)
SET(CMAKE_Java_LINKER_PREFERENCE Prefered)
SET(CMAKE_Java_OUTPUT_EXTENSION .class)
+SET(CMAKE_STATIC_LIBRARY_PREFIX_Java "")
+SET(CMAKE_STATIC_LIBRARY_SUFFIX_Java ".jar")
diff --git a/Modules/CMakeJavaInformation.cmake b/Modules/CMakeJavaInformation.cmake
index d9a8a31..b890694 100644
--- a/Modules/CMakeJavaInformation.cmake
+++ b/Modules/CMakeJavaInformation.cmake
@@ -1,5 +1,4 @@
# this is a place holder if java needed flags for javac they would go here.
-SET(CMAKE_STATIC_LIBRARY_SUFFIX_Java ".jar")
IF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY)
SET(CMAKE_Java_CREATE_STATIC_LIBRARY
"<CMAKE_Java_ARCHIVE> -cf <TARGET> *.class")