summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt7
-rw-r--r--scripts/compose_functions6
2 files changed, 10 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12a7493b3..3ed6f0076 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,9 +69,10 @@ if (NOT APPLICATION_FLAVOR_DOGTAG_PKI_THEME AND
endif ()
# ONLY required for Java-based PKI components
-if (APPLICATION_FLAVOR_PKI_CORE OR
- APPLICATION_FLAVOR_PKI_CONSOLE OR
- APPLICATION_FLAVOR_DOGTAG_PKI_THEME)
+if (APPLICATION_FLAVOR_PKI_CORE OR
+ APPLICATION_FLAVOR_PKI_CONSOLE OR
+ APPLICATION_FLAVOR_DOGTAG_PKI_THEME OR
+ APPLICATION_FLAVOR_REDHAT_PKI_THEME)
find_package(Java REQUIRED)
find_package(JNI REQUIRED)
endif ()
diff --git a/scripts/compose_functions b/scripts/compose_functions
index 1cb48ebae..75eee8911 100644
--- a/scripts/compose_functions
+++ b/scripts/compose_functions
@@ -49,6 +49,9 @@ export PKI_BASE_DIR
PKI_DOGTAG_DIR="${PKI_DIR}/dogtag"
export PKI_DOGTAG_DIR
+PKI_REDHAT_DIR="${PKI_DIR}/redhat"
+export PKI_REDHAT_DIR
+
PKI_FILE_LIST="CMakeLists.txt COPYING CPackConfig.cmake ConfigureChecks.cmake DefineOptions.cmake README cmake_uninstall.cmake.in config.h.cmake pylint-build-scan.sh dogtag.pylintrc"
export PKI_FILE_LIST
@@ -61,6 +64,9 @@ export PKI_BASE_MANIFEST
PKI_DOGTAG_MANIFEST="CMakeLists.txt"
export PKI_DOGTAG_MANIFEST
+PKI_REDHAT_MANIFEST="CMakeLists.txt"
+export PKI_REDHAT_MANIFEST
+
RHEL="/rhel/"
##