Bugzilla Bug #643206 - New CMake based build system for Dogtag

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1607 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

3 files changed, 23 insertions, 23 deletions

diff --git a/pki/dogtag/CMakeLists.txt b/pki/dogtag/CMakeLists.txt
index 823a5748..fd04debf 100644
--- a/pki/dogtag/CMakeLists.txt
+++ b/pki/dogtag/CMakeLists.txt
@@ -1,10 +1,16 @@
 project(dogtag)
 
-add_subdirectory(ca-ui)
-add_subdirectory(common-ui)
-add_subdirectory(console-ui)
-add_subdirectory(kra-ui)
-add_subdirectory(ocsp-ui)
-add_subdirectory(ra-ui)
-add_subdirectory(tks-ui)
-add_subdirectory(tps-ui)
+if (APPLICATION_FLAVOUR_NULL_THEME)
+    add_subdirectory(common-ui)
+    add_subdirectory(ca-ui)
+endif (APPLICATION_FLAVOUR_NULL_THEME)
+if (APPLICATION_FLAVOUR_DOGTAG_THEME)
+    add_subdirectory(common-ui)
+    add_subdirectory(ca-ui)
+    add_subdirectory(kra-ui)
+    add_subdirectory(ocsp-ui)
+    add_subdirectory(ra-ui)
+    add_subdirectory(tks-ui)
+    add_subdirectory(tps-ui)
+    add_subdirectory(console-ui)
+endif (APPLICATION_FLAVOUR_DOGTAG_THEME)
diff --git a/pki/dogtag/console-ui/CMakeLists.txt b/pki/dogtag/console-ui/CMakeLists.txt
index 40dbab6e..fcb7bf40 100644
--- a/pki/dogtag/console-ui/CMakeLists.txt
+++ b/pki/dogtag/console-ui/CMakeLists.txt
@@ -1,5 +1,3 @@
-project(console-ui)
-
-set(CONSOLE_UI_VERSION ${APPLICATION_VERSION})
+project(console-ui Java)
 
 add_subdirectory(src)
diff --git a/pki/dogtag/console-ui/src/CMakeLists.txt b/pki/dogtag/console-ui/src/CMakeLists.txt
index a1d65654..e13ced8e 100644
--- a/pki/dogtag/console-ui/src/CMakeLists.txt
+++ b/pki/dogtag/console-ui/src/CMakeLists.txt
@@ -1,10 +1,7 @@
 set(console_ui_java Java)
 
-set(CONSOLE_UI_TARGET pki-console-theme-${CONSOLE_UI_VERSION})
-set(CONSOLE_UI_JAR "${CMAKE_CURRENT_BINARY_DIR}/${CONSOLE_UI_TARGET}.jar" CACHE INTERNAL "console-ui jar file")
-
-set(console_ui_RCS
-    CMSAdminRS.properties
+set(console_ui_java_SRCS
+    ../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
@@ -13,11 +10,10 @@ set(console_ui_RCS
     com/netscape/admin/certsrv/theme/certmgmt.gif
 )
 
-add_jar(${CONSOLE_UI_TARGET} ${console_ui_RCS})
+set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
+
+add_jar(pki-console-theme ${console_ui_java_SRCS})
+install_jar(pki-console-theme ${JAVA_JAR_INSTALL_DIR})
+
+set(CONSOLE_UI_JAR ${pki-console-theme_JAR_FILE} CACHE INTERNAL "console-ui jar file")
 
-install(
-    FILES
-        ${CONSOLE_JAR}
-    DESTINATION
-        ${JAVA_JAR_INSTALL_DIR}/pki
-)