diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-07-21 02:26:24 +0200 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-07-26 21:18:14 +0200 |
| commit | 3f4c9e4e7946f3f330b71cfe36a00ae933de2575 (patch) | |
| tree | 760d492df7b59ad1042e30676a292617f999b684 /base | |
| parent | a307cf68e91327ddbef4b9d7e2bbd3991354831f (diff) | |
| download | pki-3f4c9e4e7946f3f330b71cfe36a00ae933de2575.tar.gz pki-3f4c9e4e7946f3f330b71cfe36a00ae933de2575.tar.xz pki-3f4c9e4e7946f3f330b71cfe36a00ae933de2575.zip | |
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
Diffstat (limited to 'base')
| -rw-r--r-- | base/native-tools/src/tkstool/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | base/server/tomcat/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | base/tps-client/src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | base/tps-client/src/authentication/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | base/tps-client/src/modules/tokendb/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | base/tps-client/src/modules/tps/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | base/tps-client/src/tus/CMakeLists.txt | 1 |
7 files changed, 8 insertions, 1 deletions
diff --git a/base/native-tools/src/tkstool/CMakeLists.txt b/base/native-tools/src/tkstool/CMakeLists.txt index 8b07950eb..8c6571788 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 4cb40ada4..c5897580d 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 b0276f8e2..28ca2e450 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 ba8ca07dc..b0ca83a7c 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 7b6edae91..94db88e8c 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 275d8b30a..ac990e5f2 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 3148d9e59..912075f52 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} |