summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2015-04-24 14:28:53 -0400
committerAde Lee <alee@redhat.com>2015-04-24 14:36:12 -0400
commit9ad2855ed5f15dfe95f4be0b556721e521190e93 (patch)
treef5bcc0bdb332a157e0988362a774e42a0dd97aac
parente1b046cffd94c789dc8b0a3f4be9fea5ab9cace0 (diff)
downloadpki-9ad2855ed5f15dfe95f4be0b556721e521190e93.tar.gz
pki-9ad2855ed5f15dfe95f4be0b556721e521190e93.tar.xz
pki-9ad2855ed5f15dfe95f4be0b556721e521190e93.zip
Add conditional to disable doclint for javadocs on java >= 1.8
-rw-r--r--base/javadoc/CMakeLists.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/base/javadoc/CMakeLists.txt b/base/javadoc/CMakeLists.txt
index 47d18399a..fa524be67 100644
--- a/base/javadoc/CMakeLists.txt
+++ b/base/javadoc/CMakeLists.txt
@@ -1,5 +1,10 @@
project(pki-javadoc)
+set(doclintstr "")
+if(${Java_VERSION_MINOR} VERSION_EQUAL 8 OR ${Java_VERSION_MINOR} VERSION_GREATER 8)
+ set(doclintstr "-Xdoclint:none")
+endif(${Java_VERSION_MINOR} VERSION_EQUAL 8 OR ${Java_VERSION_MINOR} VERSION_GREATER 8)
+
javadoc(pki-javadoc
SOURCEPATH
${CMAKE_SOURCE_DIR}/base/util/src
@@ -31,6 +36,7 @@ javadoc(pki-javadoc
-author
-use
-version
+ ${doclintstr}
DEPENDS
pki-cmsutil-jar pki-certsrv-jar pki-tomcat-jar pki-cms-jar pki-tools-jar
)