summaryrefslogtreecommitdiffstats
path: root/base/server/tomcat8/src/CMakeLists.txt
diff options
context:
space:
mode:
authorChristian Heimes <cheimes@redhat.com>2016-02-25 12:33:34 +0100
committerChristian Heimes <cheimes@redhat.com>2016-02-26 17:40:10 +0100
commit263dc2152640a95c8ca9b2829e74cce3a877f077 (patch)
treee3884dae73c8678fcbbca63fc6080a9a8f3b3350 /base/server/tomcat8/src/CMakeLists.txt
parent07b8415312a7f37c566506ec516c4c74404402eb (diff)
downloadpki-263dc2152640a95c8ca9b2829e74cce3a877f077.tar.gz
pki-263dc2152640a95c8ca9b2829e74cce3a877f077.tar.xz
pki-263dc2152640a95c8ca9b2829e74cce3a877f077.zip
pki-tomcat8 needs tomcat-api.jar to compile
Tomcat 8.0.32 has moved org.apache.tomcat.ContextBind into tomcat-api.jar. Add tomcat-api.jar to javac classpath to compile pki with latest Tomcat. https://fedorahosted.org/pki/attachment/ticket/2222
Diffstat (limited to 'base/server/tomcat8/src/CMakeLists.txt')
-rw-r--r--base/server/tomcat8/src/CMakeLists.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/base/server/tomcat8/src/CMakeLists.txt b/base/server/tomcat8/src/CMakeLists.txt
index df55916bc..8aed1fc18 100644
--- a/base/server/tomcat8/src/CMakeLists.txt
+++ b/base/server/tomcat8/src/CMakeLists.txt
@@ -44,6 +44,13 @@ find_file(TOMCAT_CATALINA_JAR
/usr/share/java/tomcat
)
+find_file(TOMCAT_API_JAR
+ NAMES
+ tomcat-api.jar
+ PATHS
+ /usr/share/java/tomcat
+)
+
find_file(TOMCAT_UTIL_SCAN_JAR
NAMES
tomcat-util-scan.jar
@@ -123,7 +130,7 @@ javac(pki-tomcat8-classes
SOURCES
com/netscape/cms/tomcat/*.java
CLASSPATH
- ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_SCAN_JAR}
+ ${SERVLET_JAR} ${TOMCAT_CATALINA_JAR} ${TOMCAT_UTIL_SCAN_JAR} ${TOMCAT_API_JAR}
${CMAKE_BINARY_DIR}/../../tomcat
OUTPUT_DIR
${CMAKE_BINARY_DIR}/../../tomcat