[geos-commits] [SCM] GEOS branch master updated. fbb180464035f2dd573cbbe3aa722d5dec159ea2

git at osgeo.org git at osgeo.org
Sat Nov 30 08:35:46 PST 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  fbb180464035f2dd573cbbe3aa722d5dec159ea2 (commit)
      from  42f1a60bd19d47db3cce5c957fddc3e068c8d25d (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 fbb180464035f2dd573cbbe3aa722d5dec159ea2
Author: Mike Taves <mwtoews at gmail.com>
Date:   Sat Nov 30 20:39:26 2019 +1300

    Fix CMake build without tests
    
    Fixes #1006

diff --git a/.gitignore b/.gitignore
index 1d28538..57712f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,4 +70,5 @@ authors.git
 !/docker/**/Makefile
 /.vs*
 .idea/
+.project
 out/
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 9365381..77c93ed 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -13,9 +13,11 @@
 add_executable(example example.cpp)
 
 target_link_libraries(example PRIVATE geos)
-target_include_directories(test_geos_unit
+if(BUILD_TESTING)
+    target_include_directories(test_geos_unit
         PRIVATE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>)
+endif()
 
 option(BUILD_DOCUMENTATION "Build Doxygen documentation" OFF)
 

-----------------------------------------------------------------------

Summary of changes:
 .gitignore         | 1 +
 doc/CMakeLists.txt | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list