[Pki-devel] [PATCH] 557 Fixed CMake issues on F22.

[Endi Sukma Dewata]

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

https://fedorahosted.org/pki/ticket/1281

-- 
Endi S. Dewata
-------------- next part --------------
From 3aebd9897b0ea628d8ddf86a95d1c8cef45fa5db Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata at redhat.com>
Date: Tue, 24 Feb 2015 21:02:13 -0500
Subject: [PATCH] Fixed CMake issues on F22.

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

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18faf8d723331c3ce71bb7d7538ae238ff3d7a22..6702ac07d5ea983225741442726a3e259dbdfc47 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 9423a8a91fa9f4b224b71d32a02a66555f08bf80..8e892ee866f8faa3832bf12150f0fa8eef8693f5 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 ff359b2a8027cee706c0aa5bd37c939fc8f3cad4..5abd264095004960f8928d307109958bef587bf1 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 2cf7b50aa8817183a4d3506a8acab3cf8d891fc2..ec487400f0ac7131493822f1740f1d93e6252237 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 29ee2c1d083201bb931036e2f13dfa6bf77725fb..aac5b196778bbf9eff129985a78839dae9196093 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
-- 
1.9.3