[geos-commits] [SCM] GEOS branch master updated. 0d4d08f0d11eff4e331aead0d25df8fe72f451f9

[git at osgeo.org]

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  0d4d08f0d11eff4e331aead0d25df8fe72f451f9 (commit)
       via  5364af8387fdf480bff50e8caa1956e950721e38 (commit)
       via  3732058a44e0ab554b91a628750e5d97bcab9ccc (commit)
       via  364ce2403a5b550b7cee38fcedf751a662644b4b (commit)
       via  8188abd3b7ea5e522d2700b53e0fde1e14cdce20 (commit)
       via  efd3fd12652f6c53680be815e36e22571fe5b1e5 (commit)
      from  6820ce966014f59880f71fa01dda6ddf64e4beb1 (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 0d4d08f0d11eff4e331aead0d25df8fe72f451f9
Merge: 6820ce9 5364af8
Author: Dan Baston <dbaston at isciences.com>
Date:   Wed May 22 11:05:41 2019 -0400

    Merge remote-tracking branch 'pramsey/modern-cmake'


commit 5364af8387fdf480bff50e8caa1956e950721e38
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu May 16 17:02:44 2019 -0500

    Change bigtest to add_executable() syntax

diff --git a/tests/bigtest/CMakeLists.txt b/tests/bigtest/CMakeLists.txt
index a809e5c..8526a6a 100644
--- a/tests/bigtest/CMakeLists.txt
+++ b/tests/bigtest/CMakeLists.txt
@@ -12,9 +12,7 @@ add_executable(test_bug234 bug234.cpp)
 target_link_libraries(test_bug234 PRIVATE geos)
 add_test(NAME test_bug234 COMMAND test_bug234)
 
-add_executable(test_sweep_line_speed)
-target_sources(test_sweep_line_speed
-  PRIVATE
+add_executable(test_sweep_line_speed
     TestSweepLineSpeed.cpp
     GeometryTestFactory.cpp)
 target_link_libraries(test_sweep_line_speed PRIVATE geos)

commit 3732058a44e0ab554b91a628750e5d97bcab9ccc
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu May 16 16:51:35 2019 -0500

    Go to old Cmake syntax for add_executable()

diff --git a/tests/xmltester/CMakeLists.txt b/tests/xmltester/CMakeLists.txt
index 1908edb..2f49cf1 100644
--- a/tests/xmltester/CMakeLists.txt
+++ b/tests/xmltester/CMakeLists.txt
@@ -12,9 +12,7 @@
 add_executable(test_simplewkttester SimpleWKTTester.cpp)
 target_link_libraries(test_simplewkttester PRIVATE geos)
 
-add_executable(test_xmltester "")
-target_sources(test_xmltester
-  PRIVATE
+add_executable(test_xmltester
     XMLTester.cpp
     BufferResultMatcher.cpp
     SingleSidedBufferResultMatcher.cpp

commit 364ce2403a5b550b7cee38fcedf751a662644b4b
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu May 16 16:44:39 2019 -0500

    Use slightly older CMake syntax in add_executable()

diff --git a/tests/xmltester/CMakeLists.txt b/tests/xmltester/CMakeLists.txt
index 9fea5aa..1908edb 100644
--- a/tests/xmltester/CMakeLists.txt
+++ b/tests/xmltester/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_executable(test_simplewkttester SimpleWKTTester.cpp)
 target_link_libraries(test_simplewkttester PRIVATE geos)
 
-add_executable(test_xmltester)
+add_executable(test_xmltester "")
 target_sources(test_xmltester
   PRIVATE
     XMLTester.cpp

commit 8188abd3b7ea5e522d2700b53e0fde1e14cdce20
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu May 16 16:31:28 2019 -0500

    Add geos_revision.h back to dist files

diff --git a/Makefile.am b/Makefile.am
index ee5c238..9f8991e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ EXTRA_DIST = acsite.m4 .editorconfig \
 	cmake/GetGitRevision.cmake \
 	cmake/cmake_uninstall.cmake.in \
 	cmake/geos-config.cmake \
+	geos_revision.h \
 	README.md
 
 ACLOCAL_AMFLAGS = -I macros

commit efd3fd12652f6c53680be815e36e22571fe5b1e5
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu May 16 16:26:50 2019 -0500

    Emit cmake version in CI

diff --git a/tools/ci/script_cmake.sh b/tools/ci/script_cmake.sh
index 22e1eed..069d392 100755
--- a/tools/ci/script_cmake.sh
+++ b/tools/ci/script_cmake.sh
@@ -11,6 +11,8 @@
 #
 source ${TRAVIS_BUILD_DIR}/tools/ci/common.sh
 
+cmake --version
+
 cmake ${TRAVIS_BUILD_DIR}
 run_make
 ctest --output-on-failure .

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

Summary of changes:
 tests/bigtest/CMakeLists.txt   | 4 +---
 tests/xmltester/CMakeLists.txt | 4 +---
 tools/ci/script_cmake.sh       | 2 ++
 3 files changed, 4 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GEOS