To help troubleshooting build issues, some CMake dependencies have been added to some targets even though the actual codes do not require those dependencies. This will ensure the targets are built sequentially so build failures can be found more easily at the end of the build log.
https://fedorahosted.org/pki/ticket/2403 -- Endi S. Dewata
>From 77fbfe25fa0b2910c911d87d4c81ca7668c8a1da Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" <[email protected]> Date: Thu, 21 Jul 2016 02:26:24 +0200 Subject: [PATCH] Added CMake target dependencies. To help troubleshooting build issues, some CMake dependencies have been added to some targets even though the actual codes do not require those dependencies. This will ensure the targets are built sequentially so build failures can be found more easily at the end of the build log. https://fedorahosted.org/pki/ticket/2403 --- base/native-tools/src/tkstool/CMakeLists.txt | 2 +- base/server/tomcat/src/CMakeLists.txt | 2 ++ base/tps-client/src/CMakeLists.txt | 1 + base/tps-client/src/authentication/CMakeLists.txt | 1 + base/tps-client/src/modules/tokendb/CMakeLists.txt | 1 + base/tps-client/src/modules/tps/CMakeLists.txt | 1 + base/tps-client/src/tus/CMakeLists.txt | 1 + 7 files changed, 8 insertions(+), 1 deletion(-) diff --git a/base/native-tools/src/tkstool/CMakeLists.txt b/base/native-tools/src/tkstool/CMakeLists.txt index 8b07950eb1220bd19f3b72bc1690cc54e99d1d9d..8c65717883393248c3d1585bf2b53946930a1594 100644 --- a/base/native-tools/src/tkstool/CMakeLists.txt +++ b/base/native-tools/src/tkstool/CMakeLists.txt @@ -34,7 +34,7 @@ set(tkstool_SRCS include_directories(${TKSTOOL_PRIVATE_INCLUDE_DIRS}) add_executable(tkstool ${tkstool_SRCS}) - +add_dependencies(tkstool pki-certsrv-jar) target_link_libraries(tkstool ${TKSTOOL_LINK_LIBRARIES}) install( diff --git a/base/server/tomcat/src/CMakeLists.txt b/base/server/tomcat/src/CMakeLists.txt index 4cb40ada4e83d4ec6ee9040e96f2c72aacec1ae3..c5897580da6e9121200f7570b1819fe4d99a33f6 100644 --- a/base/server/tomcat/src/CMakeLists.txt +++ b/base/server/tomcat/src/CMakeLists.txt @@ -135,4 +135,6 @@ javac(pki-tomcat-classes ${NUXWDOG_JAR} ${APACHE_COMMONS_LANG_JAR} ${TOMCATJSS_JAR} OUTPUT_DIR ${CMAKE_BINARY_DIR}/../../tomcat + DEPENDS + pki-certsrv-jar ) diff --git a/base/tps-client/src/CMakeLists.txt b/base/tps-client/src/CMakeLists.txt index b0276f8e27f67da4c3e671d5d3aaa2fcbd7d15da..28ca2e45056ab772ce41091a6304fc30b2175791 100644 --- a/base/tps-client/src/CMakeLists.txt +++ b/base/tps-client/src/CMakeLists.txt @@ -129,6 +129,7 @@ set(tps_library_SRCS include_directories(${TPS_PRIVATE_INCLUDE_DIRS}) add_library(${TPS_SHARED_LIBRARY} SHARED ${tps_library_SRCS}) +add_dependencies(${TPS_SHARED_LIBRARY} pki-tps-jar) target_link_libraries(${TPS_SHARED_LIBRARY} ${TPS_LINK_LIBRARIES}) set_target_properties( diff --git a/base/tps-client/src/authentication/CMakeLists.txt b/base/tps-client/src/authentication/CMakeLists.txt index ba8ca07dceed36660a8799098799e5459e2cf776..b0ca83a7cd21bf27312e27206426bed3ba4ad849 100644 --- a/base/tps-client/src/authentication/CMakeLists.txt +++ b/base/tps-client/src/authentication/CMakeLists.txt @@ -37,6 +37,7 @@ set(ldapauth_library_SRCS include_directories(${LDAPAUTH_PRIVATE_INCLUDE_DIRS}) add_library(${LDAPAUTH_SHARED_LIBRARY} SHARED ${ldapauth_library_SRCS}) +add_dependencies(${LDAPAUTH_SHARED_LIBRARY} pki-tps-jar) target_link_libraries(${LDAPAUTH_SHARED_LIBRARY} ${LDAPAUTH_LINK_LIBRARIES}) set_target_properties(${LDAPAUTH_SHARED_LIBRARY} diff --git a/base/tps-client/src/modules/tokendb/CMakeLists.txt b/base/tps-client/src/modules/tokendb/CMakeLists.txt index 7b6edae91ddbb6ce5b86f5b5edc28c9676f53bd3..94db88e8c356a81180f5c0e41c675acef9c3ac59 100644 --- a/base/tps-client/src/modules/tokendb/CMakeLists.txt +++ b/base/tps-client/src/modules/tokendb/CMakeLists.txt @@ -31,6 +31,7 @@ set(tokendb_module_SRCS include_directories(${TOKENDB_PRIVATE_INCLUDE_DIRS}) add_library(${TOKENDB_MODULE} MODULE ${tokendb_module_SRCS}) +add_dependencies(${TOKENDB_MODULE} pki-tps-jar) target_link_libraries(${TOKENDB_MODULE} ${TOKENDB_LINK_LIBRARIES}) set_target_properties(${TOKENDB_MODULE} diff --git a/base/tps-client/src/modules/tps/CMakeLists.txt b/base/tps-client/src/modules/tps/CMakeLists.txt index 275d8b30a1909319af1bdd3a87474941578b8430..ac990e5f23daf0b65ea5404a8c82ab4277a9292e 100644 --- a/base/tps-client/src/modules/tps/CMakeLists.txt +++ b/base/tps-client/src/modules/tps/CMakeLists.txt @@ -35,6 +35,7 @@ set(tps_module_SRCS include_directories(${TPS_PRIVATE_INCLUDE_DIRS}) add_library(${TPS_MODULE} MODULE ${tps_module_SRCS}) +add_dependencies(${TPS_MODULE} pki-tps-jar) target_link_libraries(${TPS_MODULE} ${TPS_LINK_LIBRARIES}) set_target_properties(${TPS_MODULE} diff --git a/base/tps-client/src/tus/CMakeLists.txt b/base/tps-client/src/tus/CMakeLists.txt index 3148d9e598233a3d03d55ff1cdc95f79e43fa04b..912075f529bb88c626e988eed9fff3b65e7bff9d 100644 --- a/base/tps-client/src/tus/CMakeLists.txt +++ b/base/tps-client/src/tus/CMakeLists.txt @@ -35,6 +35,7 @@ set(tokendb_library_SRCS include_directories(${TOKENDB_PRIVATE_INCLUDE_DIRS}) add_library(${TOKENDB_SHARED_LIBRARY} SHARED ${tokendb_library_SRCS}) +add_dependencies(${TOKENDB_SHARED_LIBRARY} pki-tps-jar) target_link_libraries(${TOKENDB_SHARED_LIBRARY} ${TOKENDB_LINK_LIBRARIES}) set_target_properties(${TOKENDB_SHARED_LIBRARY} -- 2.5.5
_______________________________________________ Pki-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/pki-devel
