From 9368ef42cea4e1e46f22628cffaa29fba66cfec6 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Tue, 25 Sep 2012 00:43:31 -0500
Subject: 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
---
 cmake/Modules/Java.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'cmake')

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)
 
-- 
cgit