diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-02-15 17:15:26 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-02-15 22:56:09 +0100 |
| commit | bc4efe021439ae064621aa511a446de2f0b421fb (patch) | |
| tree | fa285cef564019cb41e4697b7f29b7dd74163a96 | |
| parent | 771dd66e6f41042452db14af26792cf86556cf0b (diff) | |
| download | pki-bc4efe021439ae064621aa511a446de2f0b421fb.tar.gz pki-bc4efe021439ae064621aa511a446de2f0b421fb.tar.xz pki-bc4efe021439ae064621aa511a446de2f0b421fb.zip | |
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.
| -rw-r--r-- | base/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | base/ca/src/CMakeLists.txt | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index ef3189de8..92ebe4313 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 c69796653..4982ef8ef 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 |