diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-09-25 00:43:31 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-09-28 09:42:24 -0500 |
| commit | 9368ef42cea4e1e46f22628cffaa29fba66cfec6 (patch) | |
| tree | cef737e524f9d19f919a5f3e260cc4bad6b35121 /cmake | |
| parent | 854ecce0fc312e65804d84041cbc93b17cce88a5 (diff) | |
| download | pki-9368ef42cea4e1e46f22628cffaa29fba66cfec6.tar.gz pki-9368ef42cea4e1e46f22628cffaa29fba66cfec6.tar.xz pki-9368ef42cea4e1e46f22628cffaa29fba66cfec6.zip | |
Added VERSION file.
The CMake scripts have been modified to store the version number
in /usr/share/pki/VERSION and in JAR manifest files. These files
can be read by PKI applications to obtain the version number
without having to query the RPM database.
Fixed warnings in Java.cmake file.
Ticket #339
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/Java.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/Modules/Java.cmake b/cmake/Modules/Java.cmake index b0e561a2c..ea74df74b 100644 --- a/cmake/Modules/Java.cmake +++ b/cmake/Modules/Java.cmake @@ -177,7 +177,7 @@ function(jar target) -Dexclude="${exclude_${i}}" -P ${CMAKE_MODULE_PATH}/JavaFileList.cmake COMMAND ${CMAKE_Java_ARCHIVE} - -${operation}${options} ${params} + ${operation}${options} ${params} @${file_list_${i}} WORKING_DIRECTORY ${input_dir_${i}} ) @@ -227,7 +227,7 @@ function(javadoc target) endif(param STREQUAL "SOURCEPATH") - endif(arg MATCHES "(SOURCEPATH|CLASSPATH|FILES|PACKAGES|SUBPACKAGES|EXCLUDE|DEST|DEPENDS)") + endif(arg MATCHES "(SOURCEPATH|CLASSPATH|FILES|PACKAGES|SUBPACKAGES|EXCLUDE|OPTIONS|DEST|DEPENDS)") endforeach(arg) @@ -243,7 +243,7 @@ function(javadoc target) foreach (option ${options}) set(command ${command} ${option}) endforeach(option ${options}) - endif(sourcepath) + endif(options) if (sourcepath) set(tmp) @@ -265,7 +265,7 @@ function(javadoc target) set(tmp) foreach (package ${subpackages}) set(tmp "${tmp}:${package}") - endforeach(path) + endforeach(package) set(command ${command} -subpackages ${tmp}) endif(subpackages) |