diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-12-15 07:16:58 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-12-18 12:12:44 +0100 |
| commit | 843cbeed6ddab8f1883abce47a8c45e0fa14fc5a (patch) | |
| tree | 84d0625d106c4df6e00815135d9bfe6021d218c4 /base/CMakeLists.txt | |
| parent | b98ffc3d8bf386687ec53d7a73932dd2e8ff6ff8 (diff) | |
| download | pki-843cbeed6ddab8f1883abce47a8c45e0fa14fc5a.tar.gz pki-843cbeed6ddab8f1883abce47a8c45e0fa14fc5a.tar.xz pki-843cbeed6ddab8f1883abce47a8c45e0fa14fc5a.zip | |
Removed redundant find_file() for Tomcat libraries.
The CMake scripts have been modified to remove redundant
invocations of find_file() to find Tomcat libraries.
https://fedorahosted.org/pki/ticket/2560
Diffstat (limited to 'base/CMakeLists.txt')
| -rw-r--r-- | base/CMakeLists.txt | 53 |
1 files changed, 44 insertions, 9 deletions
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index e29101cc8..ef3189de8 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -1,5 +1,21 @@ project(base) +find_file(SERVLET_JAR + NAMES + servlet.jar + PATHS + /usr/share/java +) + +find_file(JAXRS_API_JAR + NAMES + jaxrs-api.jar + jboss-jaxrs-2.0-api.jar + PATHS + ${RESTEASY_LIB} + /usr/share/java +) + find_file(SLF4J_API_JAR NAMES slf4j-api.jar @@ -14,18 +30,37 @@ find_file(SLF4J_JDK14_JAR /usr/share/java/slf4j ) +find_file(TOMCAT_API_JAR + NAMES + tomcat-api.jar + PATHS + /usr/share/java/tomcat +) + +find_file(TOMCAT_CATALINA_JAR + NAMES + catalina.jar + PATHS + /usr/share/java/tomcat +) + +find_file(TOMCAT_UTIL_JAR + NAMES + tomcat-util.jar + PATHS + /usr/share/java/tomcat +) + +find_file(TOMCAT_UTIL_SCAN_JAR + NAMES + tomcat-util-scan.jar + PATHS + /usr/share/java/tomcat +) + # The order is important! if (APPLICATION_FLAVOR_PKI_CORE) - find_file(JAXRS_API_JAR - NAMES - jaxrs-api.jar - jboss-jaxrs-2.0-api.jar - PATHS - ${RESTEASY_LIB} - /usr/share/java - ) - add_subdirectory(test) add_subdirectory(symkey) add_subdirectory(util) |