From 42667acb21cee0ce73c58aaf55aea8fee19620ff Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Tue, 24 Feb 2015 21:02:13 -0500 Subject: Added support for Tomcat 8. The Dogtag code has been modified to support both Tomcat 7 and 8. All files depending on a specific Tomcat version are now stored in separate folders. The build scripts have been modified to use the proper folder for the target platform. The tomcatjss dependency has been updated as well. The upgrade script will be added in a separate patch. https://fedorahosted.org/pki/ticket/1264 --- base/server/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'base/server/CMakeLists.txt') diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt index 01a194a3d..b429c4e80 100644 --- a/base/server/CMakeLists.txt +++ b/base/server/CMakeLists.txt @@ -140,7 +140,14 @@ install( install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}${VAR_INSTALL_DIR}/lock/pki)") install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}${VAR_INSTALL_DIR}/run/pki)") -add_subdirectory(tomcat) +if(WITH_TOMCAT7) + add_subdirectory(tomcat7) +endif(WITH_TOMCAT7) + +if(WITH_TOMCAT8) + add_subdirectory(tomcat8) +endif(WITH_TOMCAT8) + add_subdirectory(cms) add_subdirectory(cmsbundle) add_subdirectory(cmscore) -- cgit