You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2017/04/21 17:57:45 UTC
nifi-minifi-cpp git commit: MINIFI-273: Update docs target to not
fail the build.
Repository: nifi-minifi-cpp
Updated Branches:
refs/heads/master f3f8f5319 -> 573c511f7
MINIFI-273: Update docs target to not fail the build.
If doxygen is not present we will request that it be installed.
If the FindDoxygen module indicates that Doxygen is found, but not
binary is found, we can request a proper installation instead of
failing the build.
This closes #79.
Signed-off-by: Aldrin Piri <al...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/573c511f
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/573c511f
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/573c511f
Branch: refs/heads/master
Commit: 573c511f755b94eb1c6a96581ca24916585f6b8b
Parents: f3f8f53
Author: Marc Parisi <ph...@apache.org>
Authored: Fri Apr 21 10:44:13 2017 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Fri Apr 21 13:57:00 2017 -0400
----------------------------------------------------------------------
.travis.yml | 1 +
CMakeLists.txt | 12 +++++++++---
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/573c511f/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 97c5f77..14c0e09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,6 +46,7 @@ matrix:
- package='boost'; [[ $(brew ls --versions ${package}) ]] && { brew outdated ${package} || brew upgrade ${package}; } || brew install ${package}
- package='cmake'; [[ $(brew ls --versions ${package}) ]] && { brew outdated ${package} || brew upgrade ${package}; } || brew install ${package}
- package='openssl'; [[ $(brew ls --versions ${package}) ]] && { brew outdated ${package} || brew upgrade ${package}; } || brew install ${package}
+ - package='doxygen'; [[ $(brew ls --versions ${package}) ]] && { brew outdated ${package} || brew upgrade ${package}; } || brew install ${package}
- os: osx
osx_image: xcode8.3
# https://docs.travis-ci.com/user/osx-ci-environment/#Homebrew
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/573c511f/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 197ea98..519dae9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,9 +167,11 @@ add_custom_target(
FIND_PACKAGE(Doxygen)
+
if(DOXYGEN_FOUND)
-
-MESSAGE(Creating API Documentation)
+if(EXISTS ${DOXYGEN_EXECUTABLE})
+
+MESSAGE("Creating API Documentation ${DOXYGEN_EXECUTABLE}")
SET(DOXYGEN_INPUT "../docs/Doxyfile")
SET(DOXYGEN_OUTPUT "../docs")
@@ -183,5 +185,9 @@ ADD_CUSTOM_COMMAND(
)
ADD_CUSTOM_TARGET(docs ${DOXYGEN_EXECUTABLE} ${DOXYGEN_INPUT})
-
+else()
+ADD_CUSTOM_TARGET(docs echo "Doxygen binary does not exist. Cannot create documentation... Please install Doxygen or verify correct installation.")
+endif()
+else()
+ADD_CUSTOM_TARGET(docs echo "Doxygen does not exist. Please install it. Cannot create documentation...")
endif(DOXYGEN_FOUND)