1 files changed, 29 insertions, 12 deletions
diff --git a/dogtag/console-ui/src/CMakeLists.txt b/dogtag/console-ui/src/CMakeLists.txt
index bc8995a12..c6c4fcb3b 100644
--- a/dogtag/console-ui/src/CMakeLists.txt
+++ b/dogtag/console-ui/src/CMakeLists.txt
@@ -1,18 +1,35 @@
 set(pki-console-theme_java Java)
 
-set(pki-console-theme_java_RCS
-    CMSAdminRS.properties
-    com/netscape/management/client/theme/theme.properties
-    com/netscape/management/client/theme/images/login.gif
-    com/netscape/management/client/theme/images/ConsoleBanner.gif
-    com/netscape/management/client/theme/images/logo16.gif
-    com/netscape/management/client/theme/images/logo32.gif
-    com/netscape/admin/certsrv/theme/certmgmt.gif
+jar(pki-console-theme-jar
+    CREATE
+        ${CMAKE_BINARY_DIR}/dist/pki-console-theme-${APPLICATION_VERSION}.jar
+    FILES
+        CMSAdminRS.properties
+        com/netscape/management/client/theme/theme.properties
+        com/netscape/management/client/theme/images/login.gif
+        com/netscape/management/client/theme/images/ConsoleBanner.gif
+        com/netscape/management/client/theme/images/logo16.gif
+        com/netscape/management/client/theme/images/logo32.gif
+        com/netscape/admin/certsrv/theme/certmgmt.gif
 )
 
-set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
+link(pki-console-theme
+    SOURCE
+        ${CMAKE_BINARY_DIR}/dist/pki-console-theme.jar
+    DEST
+        pki-console-theme-${APPLICATION_VERSION}.jar
+    DEPENDS
+        pki-console-theme-jar
+)
 
-add_jar(pki-console-theme ${pki-console-theme_java_RCS})
-install_jar(pki-console-theme ${JAVA_JAR_INSTALL_DIR}/pki)
-set(PKI_CONSOLE_THEME_JAR ${pki-console-theme_JAR_FILE} CACHE INTERNAL "pki-console-theme jar file")
+install(
+    FILES
+        ${CMAKE_BINARY_DIR}/dist/pki-console-theme.jar
+        ${CMAKE_BINARY_DIR}/dist/pki-console-theme-${APPLICATION_VERSION}.jar
+    DESTINATION
+        ${JAVA_JAR_INSTALL_DIR}/pki
+)
 
+set(PKI_CONSOLE_THEME_JAR ${CMAKE_BINARY_DIR}/dist/pki-console-theme.jar
+    CACHE INTERNAL "pki-console-theme jar file"
+)