diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2015-02-24 21:02:13 -0500 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2015-03-05 11:30:22 -0500 |
| commit | 9bccfa9fcf2ea8361f1a32ea89ec69d37a4e43a8 (patch) | |
| tree | 2b22b0ea1472d69ea6d406f0da92d552bd41f087 | |
| parent | f39e3387f8a671ef97a08d1c0c3e4b2b6fd65ad3 (diff) | |
| download | pki-9bccfa9fcf2ea8361f1a32ea89ec69d37a4e43a8.tar.gz pki-9bccfa9fcf2ea8361f1a32ea89ec69d37a4e43a8.tar.xz pki-9bccfa9fcf2ea8361f1a32ea89ec69d37a4e43a8.zip | |
Fixed CMake issues on F22.
Some CMake scripts have been updated to work on both F21 and F22.
https://fedorahosted.org/pki/ticket/1281
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | base/javadoc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | base/server/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | base/util/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | specs/pki-core.spec | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 18faf8d72..6702ac07d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/dist) # required for all PKI components include(JUnit) -add_custom_target(test) +add_custom_target(unit-test) # search for libraries diff --git a/base/javadoc/CMakeLists.txt b/base/javadoc/CMakeLists.txt index 9423a8a91..8e892ee86 100644 --- a/base/javadoc/CMakeLists.txt +++ b/base/javadoc/CMakeLists.txt @@ -35,7 +35,7 @@ javadoc(pki-javadoc ) install( - FILES + DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/javadoc/pki-${APPLICATION_VERSION} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/javadoc diff --git a/base/server/test/CMakeLists.txt b/base/server/test/CMakeLists.txt index ff359b2a8..5abd26409 100644 --- a/base/server/test/CMakeLists.txt +++ b/base/server/test/CMakeLists.txt @@ -72,4 +72,4 @@ add_junit_test(test-pki-server ) # include test into the main test -add_dependencies(test test-pki-server) +add_dependencies(unit-test test-pki-server) diff --git a/base/util/test/CMakeLists.txt b/base/util/test/CMakeLists.txt index 2cf7b50aa..ec487400f 100644 --- a/base/util/test/CMakeLists.txt +++ b/base/util/test/CMakeLists.txt @@ -40,4 +40,4 @@ add_junit_test(test-pki-util ) # include test into the main test -add_dependencies(test test-pki-util) +add_dependencies(unit-test test-pki-util) diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 29ee2c1d0..aac5b1967 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -607,7 +607,7 @@ cd build %endif .. %{__make} VERBOSE=1 %{?_smp_mflags} all -# %{__make} VERBOSE=1 %{?_smp_mflags} test +# %{__make} VERBOSE=1 %{?_smp_mflags} unit-test %install |