summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2012-11-20 11:03:28 -0500
committerAde Lee <alee@redhat.com>2012-11-20 15:05:10 -0500
commit9862a04acb57278c3b9f97b7517970cf5078017f (patch)
tree70042874bd7a50274be377340a4cf3a7c8499b87
parent440a9e7071eaa833a9abeaa3cf6314142fb6e11c (diff)
downloadpki-9862a04acb57278c3b9f97b7517970cf5078017f.zip
pki-9862a04acb57278c3b9f97b7517970cf5078017f.tar.gz
pki-9862a04acb57278c3b9f97b7517970cf5078017f.tar.xz
Updating cmake variables
-rw-r--r--CMakeLists.txt1
-rw-r--r--base/symkey/src/com/netscape/symkey/CMakeLists.txt2
-rw-r--r--cmake/Modules/JUnit.cmake2
-rw-r--r--cmake/Modules/Java.cmake8
4 files changed, 7 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e577f7..5102585 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,6 +97,7 @@ endif ()
# ONLY required for Java-based PKI components
if (APPLICATION_FLAVOR_PKI_CORE OR
APPLICATION_FLAVOR_PKI_CONSOLE OR
+ APPLICATION_FLAVOR_DOGTAG_PKI_THEME OR
APPLICATION_FLAVOR_PKI_MIGRATE)
find_package(Java REQUIRED)
find_package(JNI REQUIRED)
diff --git a/base/symkey/src/com/netscape/symkey/CMakeLists.txt b/base/symkey/src/com/netscape/symkey/CMakeLists.txt
index cf5759c..84c8e08 100644
--- a/base/symkey/src/com/netscape/symkey/CMakeLists.txt
+++ b/base/symkey/src/com/netscape/symkey/CMakeLists.txt
@@ -40,7 +40,7 @@ add_custom_command(
OUTPUT
${symkey_library_HDRS}
COMMAND
- ${JAVA_HEADER}
+ ${Java_JAVAH_EXECUTABLE}
-classpath ${CMAKE_BINARY_DIR}/classes:${JAVA_LIB_INSTALL_DIR}/jss4.jar
-jni -d ${CMAKE_CURRENT_BINARY_DIR}
com.netscape.symkey.SessionKey
diff --git a/cmake/Modules/JUnit.cmake b/cmake/Modules/JUnit.cmake
index 84faa68..feab6d3 100644
--- a/cmake/Modules/JUnit.cmake
+++ b/cmake/Modules/JUnit.cmake
@@ -55,7 +55,7 @@ function(add_junit_test TARGET_NAME)
COMMAND
mkdir -p "${REPORTS_DIR}"
COMMAND
- ${CMAKE_Java_RUNTIME}
+ ${Java_JAVA_EXECUTABLE}
-Djunit.reports.dir=${REPORTS_DIR}
-classpath ${CLASSPATH}
com.netscape.test.TestRunner
diff --git a/cmake/Modules/Java.cmake b/cmake/Modules/Java.cmake
index ea74df7..df006b4 100644
--- a/cmake/Modules/Java.cmake
+++ b/cmake/Modules/Java.cmake
@@ -77,7 +77,7 @@ function(javac target)
-Dfiles="${sources}"
-Dexclude="${exclude}"
-P ${CMAKE_MODULE_PATH}/JavaFileList.cmake
- COMMAND ${CMAKE_Java_COMPILER}
+ COMMAND ${Java_JAVAC_EXECUTABLE}
${CMAKE_JAVA_COMPILE_FLAGS}
-encoding UTF-8
-cp ${native_classpath}
@@ -176,7 +176,7 @@ function(jar target)
-Dfiles="${files_${i}}"
-Dexclude="${exclude_${i}}"
-P ${CMAKE_MODULE_PATH}/JavaFileList.cmake
- COMMAND ${CMAKE_Java_ARCHIVE}
+ COMMAND ${Java_JAR_EXECUTABLE}
${operation}${options} ${params}
@${file_list_${i}}
WORKING_DIRECTORY ${input_dir_${i}}
@@ -237,7 +237,7 @@ function(javadoc target)
set(separator ";")
endif(UNIX)
- set(command ${JAVA_DOC} -d ${dest})
+ set(command ${Java_JAVADOC_EXECUTABLE} -d ${dest})
if (options)
foreach (option ${options})
@@ -320,4 +320,4 @@ function(link target)
-E create_symlink ${dest} ${source}
)
-endfunction(link) \ No newline at end of file
+endfunction(link)