[geos-commits] [SCM] GEOS branch master updated. 3dd712169049be0c38665765979234968be6540f
git at osgeo.org
git at osgeo.org
Tue Feb 23 17:02:29 PST 2021
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 3dd712169049be0c38665765979234968be6540f (commit)
via 2b807c02de4b4eec51a6f47c756def22af403e3e (commit)
via dedd10e993494064d91697f70d13af908d083d48 (commit)
via f00492a6904bc990282c2aa9d687bed7abc2cfe9 (commit)
via d1adac1d1d488560af4d5aa22727ddca55ff94e7 (commit)
from 6c8ed469f0475d36a68c15912c170e55d2c3ac02 (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 3dd712169049be0c38665765979234968be6540f
Merge: 6c8ed46 2b807c0
Author: Daniel Baston <dbaston at gmail.com>
Date: Tue Feb 23 20:02:14 2021 -0500
Merge branch 'cmake-vendor-libs'
commit 2b807c02de4b4eec51a6f47c756def22af403e3e
Author: Daniel Baston <dbaston at gmail.com>
Date: Sun Jan 31 16:04:33 2021 -0500
Add comment [ci skip]
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82e2e3c..6890225 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -252,6 +252,8 @@ set(CMAKE_CXX_FLAGS_COVERAGE "-fprofile-arcs -ftest-coverage")
#-----------------------------------------------------------------------------
add_library(geos "")
target_link_libraries(geos PUBLIC geos_cxx_flags PRIVATE $<BUILD_INTERFACE:ryu>)
+# ryu is an object library, nothing is actually being linked here. The BUILD_INTERFACE
+# switch was necessary to build on AppVeyor (CMake 3.16.2) but not locally (CMake 3.16.3)
add_subdirectory(include)
add_subdirectory(src)
commit dedd10e993494064d91697f70d13af908d083d48
Author: Daniel Baston <dbaston at gmail.com>
Date: Sun Jan 31 10:02:26 2021 -0500
Avoid install error about ryu?
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47c8eab..82e2e3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -251,7 +251,7 @@ set(CMAKE_CXX_FLAGS_COVERAGE "-fprofile-arcs -ftest-coverage")
# Target geos: C++ API library
#-----------------------------------------------------------------------------
add_library(geos "")
-target_link_libraries(geos PUBLIC geos_cxx_flags PRIVATE ryu)
+target_link_libraries(geos PUBLIC geos_cxx_flags PRIVATE $<BUILD_INTERFACE:ryu>)
add_subdirectory(include)
add_subdirectory(src)
commit f00492a6904bc990282c2aa9d687bed7abc2cfe9
Author: Daniel Baston <dbaston at gmail.com>
Date: Sun Jan 31 08:52:16 2021 -0500
[appveyor] Emit CMake version
diff --git a/appveyor.yml b/appveyor.yml
index 8d61646..fb2a2b3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -60,18 +60,16 @@ init:
before_build:
- ps: 'Write-Host "Running $env:BUILDER with $env:GENERATOR" -ForegroundColor Magenta'
- - if "%BUILDER%"=="CMake" cmake.exe -G "%GENERATOR%" -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=%CONFIGURATION% %APPVEYOR_BUILD_FOLDER%
- - if "%BUILDER%"=="NMake" .\autogen.bat
+ - cmake --version
+ - cmake -G "%GENERATOR%" -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=%CONFIGURATION% %APPVEYOR_BUILD_FOLDER%
build_script:
- ps: 'Write-Host "Running $env:BUILDER:" -ForegroundColor Magenta'
- - if "%BUILDER%"=="CMake" cmake --build . --config %CONFIGURATION%
- - if "%BUILDER%"=="NMake" nmake /f makefile.vc
+ - cmake --build . --config %CONFIGURATION%
test_script:
- ps: 'Write-Host "Running tests:" -ForegroundColor Magenta'
- - if "%BUILDER%"=="CMake" ctest --output-on-failure -C %CONFIGURATION%
- - if "%BUILDER%"=="NMake" echo *** NMake does NOT build tests ***
+ - ctest --output-on-failure -C %CONFIGURATION%
# If you need to debug AppVeyor session (https://www.appveyor.com/docs/how-to/rdp-to-build-worker), then:
# 1. Uncomment the on_finish section below:
commit d1adac1d1d488560af4d5aa22727ddca55ff94e7
Author: Daniel Baston <dbaston at gmail.com>
Date: Fri Jan 29 19:57:21 2021 -0500
Exclude vendored libs from GEOS compiler warnings
diff --git a/CMakeLists.txt b/CMakeLists.txt
index df264f2..47c8eab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -251,7 +251,7 @@ set(CMAKE_CXX_FLAGS_COVERAGE "-fprofile-arcs -ftest-coverage")
# Target geos: C++ API library
#-----------------------------------------------------------------------------
add_library(geos "")
-target_link_libraries(geos PUBLIC geos_cxx_flags)
+target_link_libraries(geos PUBLIC geos_cxx_flags PRIVATE ryu)
add_subdirectory(include)
add_subdirectory(src)
diff --git a/src/deps/CMakeLists.txt b/src/deps/CMakeLists.txt
index 48caade..7a6fac1 100644
--- a/src/deps/CMakeLists.txt
+++ b/src/deps/CMakeLists.txt
@@ -9,7 +9,9 @@
# See the COPYING file for more information.
################################################################################
file(GLOB_RECURSE _sources ${CMAKE_CURRENT_LIST_DIR}/*.c CONFIGURE_DEPEND)
-target_sources(geos PRIVATE ${_sources})
+add_library(ryu OBJECT ${_sources})
+target_include_directories(ryu PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+set_target_properties(ryu PROPERTIES POSITION_INDEPENDENT_CODE ON)
unset(_sources)
target_include_directories(geos
diff --git a/tests/xmltester/CMakeLists.txt b/tests/xmltester/CMakeLists.txt
index 9b8040c..87113ac 100644
--- a/tests/xmltester/CMakeLists.txt
+++ b/tests/xmltester/CMakeLists.txt
@@ -13,16 +13,24 @@
add_executable(test_simplewkttester SimpleWKTTester.cpp)
target_link_libraries(test_simplewkttester PRIVATE geos)
+# Setup tinyxml as a separate library so we can avoid picking up GEOS compile flags
+add_library(tinyxml2 OBJECT
+ tinyxml2/tinyxml2.h
+ tinyxml2/tinyxml2.cpp)
+target_compile_options(
+ tinyxml2 PRIVATE
+ $<$<CXX_COMPILER_ID:GNU>:-Wno-conversion>
+ $<$<CXX_COMPILER_ID:Clang>:-Wno-conversion>
+)
+
add_executable(test_xmltester
XMLTester.cpp
BufferResultMatcher.cpp
- SingleSidedBufferResultMatcher.cpp
- tinyxml2/tinyxml2.h
- tinyxml2/tinyxml2.cpp)
-target_link_libraries(test_xmltester PRIVATE geos)
+ SingleSidedBufferResultMatcher.cpp)
+target_link_libraries(test_xmltester PRIVATE geos tinyxml2)
target_include_directories(test_xmltester
- PRIVATE
- $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/tinyxml)
+ SYSTEM PRIVATE
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/tinyxml2)
# Scan the directories of XML tests and create a test for each.
foreach(_testdir general issue misc robust validate)
diff --git a/tests/xmltester/XMLTester.h b/tests/xmltester/XMLTester.h
index 5233060..34a08cb 100644
--- a/tests/xmltester/XMLTester.h
+++ b/tests/xmltester/XMLTester.h
@@ -18,7 +18,7 @@
#include <geos/geom/GeometryFactory.h>
#include <geos/geom/PrecisionModel.h>
#include <geos/profiler.h>
-#include "tinyxml2/tinyxml2.h"
+#include <tinyxml2.h>
using namespace geos;
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 4 +++-
appveyor.yml | 10 ++++------
src/deps/CMakeLists.txt | 4 +++-
tests/xmltester/CMakeLists.txt | 20 ++++++++++++++------
tests/xmltester/XMLTester.h | 2 +-
5 files changed, 25 insertions(+), 15 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list