diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2014-09-09 16:59:32 -0700 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@pki.usersys.redhat.com> | 2014-09-30 10:30:54 -0700 |
| commit | 3947cbb320da7191fac2c7705763732f53cdbaae (patch) | |
| tree | 6a433a22eedfe219c0aef84186e4bb5d0626209b /CMakeLists.txt | |
| parent | 0c60b79971c914fb93ec51b5b076156381e00158 (diff) | |
| download | pki-3947cbb320da7191fac2c7705763732f53cdbaae.tar.gz pki-3947cbb320da7191fac2c7705763732f53cdbaae.tar.xz pki-3947cbb320da7191fac2c7705763732f53cdbaae.zip | |
Remove IPA theme component and old unused UI directories
- PKI TRAC Ticket #1136 - Remove ipa-pki-theme component
- Remove 'ca-ui', 'kra-ui', 'ocsp-ui', 'ra-ui', 'tks-ui', and 'tps-ui' directories
- Consolidate 'pki-core' packages
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a0862c470..1b04500a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,9 +17,7 @@ string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" APPLICATION_VERSION_P option(WITH_JAVADOC "Build Javadoc" ON) option(WITH_SERVER "Build Server" ON) -if (BUILD_IPA_PKI_THEME) - set(APPLICATION_FLAVOR_IPA_PKI_THEME TRUE) -elseif (BUILD_DOGTAG_PKI_THEME) +if (BUILD_DOGTAG_PKI_THEME) set(APPLICATION_FLAVOR_DOGTAG_PKI_THEME TRUE) elseif (BUILD_REDHAT_PKI_THEME) set(APPLICATION_FLAVOR_REDHAT_PKI_THEME TRUE) @@ -56,18 +54,15 @@ include(Java) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/classes) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/dist) -# required for all PKI components EXCEPT IPA_PKI_THEME -if (NOT APPLICATION_FLAVOR_IPA_PKI_THEME) - include(JUnit) +# required for all PKI components +include(JUnit) - add_custom_target(test) -endif () +add_custom_target(test) # search for libraries # required for all PKI components EXCEPT Theme-based components and PKI_MIGRATE -if (NOT APPLICATION_FLAVOR_IPA_PKI_THEME AND - NOT APPLICATION_FLAVOR_DOGTAG_PKI_THEME AND +if (NOT APPLICATION_FLAVOR_DOGTAG_PKI_THEME AND NOT APPLICATION_FLAVOR_REDHAT_PKI_THEME AND NOT APPLICATION_FLAVOR_PKI_MIGRATE) find_package(NSPR REQUIRED) @@ -152,9 +147,7 @@ if (APPLICATION_FLAVOR_PKI_CORE OR endif () # 'Themes' MUST be "mutually-exclusive"! -if (APPLICATION_FLAVOR_IPA_PKI_THEME) - add_subdirectory(dogtag) -elseif (APPLICATION_FLAVOR_DOGTAG_PKI_THEME) +if (APPLICATION_FLAVOR_DOGTAG_PKI_THEME) add_subdirectory(dogtag) elseif (APPLICATION_FLAVOR_REDHAT_PKI_THEME) add_subdirectory(redhat) |