From 9bccfa9fcf2ea8361f1a32ea89ec69d37a4e43a8 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Tue, 24 Feb 2015 21:02:13 -0500
Subject: Fixed CMake issues on F22.

Some CMake scripts have been updated to work on both F21 and F22.

https://fedorahosted.org/pki/ticket/1281
---
 base/javadoc/CMakeLists.txt     | 2 +-
 base/server/test/CMakeLists.txt | 2 +-
 base/util/test/CMakeLists.txt   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'base')

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)
-- 
cgit