[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Pki-devel] [PATCH] 935 Cleaned up CMake scripts for Jackson libraries.



To avoid redundancy the code that finds Jackson libraries has been
moved to the top level CMake script.

Pushed to master under trivial rule.

--
Endi S. Dewata
>From 2aaa8d00ddc1460ee5df446df91afe834f527868 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata redhat com>
Date: Wed, 15 Feb 2017 17:15:26 +0100
Subject: [PATCH] Cleaned up CMake scripts for Jackson libraries.

To avoid redundancy the code that finds Jackson libraries has been
moved to the top level CMake script.
---
 base/CMakeLists.txt        | 14 ++++++++++++++
 base/ca/src/CMakeLists.txt | 14 --------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index ef3189de8939674c6514dc3fafbb77f9cef3d663..92ebe4313154710ab2a45adea8d4ed63904e8a34 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -30,6 +30,20 @@ find_file(SLF4J_JDK14_JAR
         /usr/share/java/slf4j
 )
 
+find_file(JACKSON_CORE_JAR
+    NAMES
+        jackson-core-asl.jar
+    PATHS
+        /usr/share/java/jackson
+)
+
+find_file(JACKSON_MAPPER_JAR
+    NAMES
+        jackson-mapper-asl.jar
+    PATHS
+        /usr/share/java/jackson
+)
+
 find_file(TOMCAT_API_JAR
     NAMES
         tomcat-api.jar
diff --git a/base/ca/src/CMakeLists.txt b/base/ca/src/CMakeLists.txt
index c697966538002678e2ec7f9654adbe6aa413b2d4..4982ef8efce107931d809b11d4e7df0d5d113508 100644
--- a/base/ca/src/CMakeLists.txt
+++ b/base/ca/src/CMakeLists.txt
@@ -38,20 +38,6 @@ find_file(COMMONS_LANG_JAR
         /usr/share/java
 )
 
-find_file(JACKSON_CORE_JAR
-    NAMES
-        jackson-core-asl.jar
-    PATHS
-        /usr/share/java/jackson
-)
-
-find_file(JACKSON_MAPPER_JAR
-    NAMES
-        jackson-mapper-asl.jar
-    PATHS
-        /usr/share/java/jackson
-)
-
 find_file(RESTEASY_JAXRS_JAR
     NAMES
         resteasy-jaxrs.jar
-- 
2.5.5


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]