[geos-commits] [SCM] GEOS branch master updated. 26ccaf42ee19df2ff2f4164a1a7d7a5237e93140
git at osgeo.org
git at osgeo.org
Mon Sep 9 06:21:11 PDT 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".
The branch, master has been updated
via 26ccaf42ee19df2ff2f4164a1a7d7a5237e93140 (commit)
via 140c81a50ad133f005a0e5e511049ea2328f127c (commit)
from 32af81367a06cc47725cbf7d0c3b6773862d04d0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 26ccaf42ee19df2ff2f4164a1a7d7a5237e93140
Author: Daniel Baston <dbaston at gmail.com>
Date: Fri Sep 6 20:47:02 2019 -0400
Add doxygen to Travis
diff --git a/.travis.yml b/.travis.yml
index c4d7633..0af9a79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ matrix:
addons:
apt:
sources: *sources
- packages: ['g++-7','cmake','ccache']
+ packages: ['g++-7','cmake','ccache','doxygen']
env:
- E="TOOL=cmake && BUILD_TYPE=Release && CXX=g++-7 && ARCH=-m64 && CC=gcc-7"
@@ -39,7 +39,7 @@ matrix:
addons:
apt:
sources: *sources
- packages: ['g++-7','cmake','ccache']
+ packages: ['g++-7','cmake','ccache','doxygen']
env:
- E="TOOL=cmake && BUILD_TYPE=Coverage && CXX=g++-7 && ARCH=-m64 && CC=gcc-7"
@@ -51,7 +51,7 @@ matrix:
addons:
apt:
sources: *sources
- packages: ['g++-7','ccache','git2cl']
+ packages: ['g++-7','ccache','git2cl','doxygen']
env:
- E="TOOL=autotools && CXX=g++-7 && ARCH=-m64 && CC=gcc-7"
@@ -63,7 +63,7 @@ matrix:
addons:
apt:
sources: *sources
- packages: ['g++-4.8','cmake','ccache']
+ packages: ['g++-4.8','cmake','ccache','doxygen']
env:
- E="TOOL=cmake && BUILD_TYPE=Release && CXX=g++-4.8 && ARCH=-m64 && CC=gcc-4.8"
@@ -75,7 +75,7 @@ matrix:
addons:
apt:
sources: *sources
- packages: ['g++-4.8-multilib','gcc-4.8-multilib','g++-multilib','gcc-multilib','ccache','git2cl']
+ packages: ['g++-4.8-multilib','gcc-4.8-multilib','g++-multilib','gcc-multilib','ccache','git2cl','doxygen']
env:
- E="TOOL=autotools && CXX=g++-4.8 && ARCH=-m32 && CC=gcc-4.8"
@@ -87,7 +87,7 @@ matrix:
addons:
apt:
sources: *sources
- packages: ['clang-3.9','cmake','ccache']
+ packages: ['clang-3.9','cmake','ccache','doxygen']
env:
- E="TOOL=cmake && BUILD_TYPE=Release && CXX=clang++-3.9 && ARCH=-m64 && CC=clang-3.9"
@@ -99,7 +99,7 @@ matrix:
addons:
apt:
sources: *sources
- packages: ['clang','cmake','ccache']
+ packages: ['clang','cmake','ccache','doxygen']
env:
- E="TOOL=cmake && BUILD_TYPE=Release && CXX=clang++ && ARCH=-m64 && CC=clang"
commit 140c81a50ad133f005a0e5e511049ea2328f127c
Author: Daniel Baston <dbaston at gmail.com>
Date: Thu Sep 5 20:43:29 2019 -0400
Add Doxygen "docs" target to CMake build
Must be explicitly enabled using -DBUILD_DOCUMENTATION=YES
Direct all warnings to a log file that can be grepped for specific
errors as part of a CI build.
Fixes #902
diff --git a/configure.ac b/configure.ac
index 5067088..8677887 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,8 @@ dnl -- JTS_PORT: the version of JTS this release is bound to
dnl JTS_PORT=1.13.0
JTS_PORT=`cat $VERTXT | awk -F= '/^JTS_PORT/ {print $2}'`
+DOXYGEN_LOGFILE=
+AC_SUBST(DOXYGEN_LOGFILE)
dnl Hush warnings
AC_DEFINE(USE_UNSTABLE_GEOS_CPP_API, [1], [We know])
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index f2295fe..f855379 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -2,6 +2,7 @@
# Part of CMake configuration for GEOS
#
# Copyright (C) 2018 Mateusz Loskot <mateusz at loskot.net>
+# Copyright (C) 2019 Daniel Baston <dbaston at gmail.com>
#
# This is free software; you can redistribute and/or modify it under
# the terms of the GNU Lesser General Public Licence as published
@@ -15,3 +16,24 @@ target_link_libraries(example PRIVATE geos)
target_include_directories(test_geos_unit
PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>)
+
+option(BUILD_DOCUMENTATION "Build Doxygen documentation" OFF)
+
+if(BUILD_DOCUMENTATION)
+ find_package(Doxygen)
+
+ if(NOT DOXYGEN_FOUND)
+ message(FATAL_ERROR "Doxygen was not found.")
+ endif()
+
+ set(srcdir ${CMAKE_CURRENT_SOURCE_DIR})
+ set(DOXYGEN_LOGFILE ${CMAKE_CURRENT_BINARY_DIR}/doxygen_log)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
+ ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+ @ONLY)
+ unset(srcdir)
+ unset(DOXYGEN_LOGFILE)
+
+ add_custom_target(docs
+ COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+endif()
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index ef93b77..fd61667 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -779,7 +779,7 @@ WARN_FORMAT = "$file:$line: $text"
# messages should be written. If left blank the output is written to standard
# error (stderr).
-WARN_LOGFILE =
+WARN_LOGFILE = @DOXYGEN_LOGFILE@
#---------------------------------------------------------------------------
# Configuration options related to the input files
@@ -853,6 +853,7 @@ EXCLUDE_PATTERNS = */examples/* \
*/test/* \
*/bigtest/* \
*/io/markup/* \
+ */ttmath/* \
config.h \
acconfig.h \
CoordinateList.cpp \
diff --git a/tools/ci/script_cmake.sh b/tools/ci/script_cmake.sh
index 583ff6b..287abda 100755
--- a/tools/ci/script_cmake.sh
+++ b/tools/ci/script_cmake.sh
@@ -13,8 +13,9 @@ source ${TRAVIS_BUILD_DIR}/tools/ci/common.sh
cmake --version
-cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${TRAVIS_BUILD_DIR}
+cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_DOCUMENTATION=YES ${TRAVIS_BUILD_DIR}
run_make
+cmake --build . --target docs
ctest --output-on-failure .
if [ "${BUILD_TYPE}" = "Coverage" ]; then
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 14 +++++++-------
configure.ac | 2 ++
doc/CMakeLists.txt | 22 ++++++++++++++++++++++
doc/Doxyfile.in | 3 ++-
tools/ci/script_cmake.sh | 3 ++-
5 files changed, 35 insertions(+), 9 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list