[geos-commits] [SCM] GEOS branch master updated. 2ba3d4a30721e7c04b4abf58938236eb34c9584f
git at osgeo.org
git at osgeo.org
Tue May 21 08:57:01 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 2ba3d4a30721e7c04b4abf58938236eb34c9584f (commit)
via c8fa111a7fa01242ae17910cda65108894c2173c (commit)
via 03d9dddfd1017792086ccb0d2186bdcd56f10419 (commit)
from 6b14044c691c7aa02177496686ef43f2a3911ade (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 2ba3d4a30721e7c04b4abf58938236eb34c9584f
Merge: 6b14044 c8fa111
Author: Daniel Baston <dbaston at gmail.com>
Date: Tue May 21 11:55:29 2019 -0400
Merge branch 'fix-msvc-cmake'
commit c8fa111a7fa01242ae17910cda65108894c2173c
Author: Daniel Baston <dbaston at gmail.com>
Date: Tue May 21 11:49:09 2019 -0400
Revert "Remove unstable API warnings for tests"
This reverts commit ae73bc45bbad44703ed0532b64ed0c2440a9cf90.
diff --git a/tests/bigtest/CMakeLists.txt b/tests/bigtest/CMakeLists.txt
index ebff39f..a809e5c 100644
--- a/tests/bigtest/CMakeLists.txt
+++ b/tests/bigtest/CMakeLists.txt
@@ -11,7 +11,6 @@
add_executable(test_bug234 bug234.cpp)
target_link_libraries(test_bug234 PRIVATE geos)
add_test(NAME test_bug234 COMMAND test_bug234)
-target_compile_definitions(test_bug234 PRIVATE "USE_UNSTABLE_GEOS_CPP_API")
add_executable(test_sweep_line_speed)
target_sources(test_sweep_line_speed
@@ -19,4 +18,3 @@ target_sources(test_sweep_line_speed
TestSweepLineSpeed.cpp
GeometryTestFactory.cpp)
target_link_libraries(test_sweep_line_speed PRIVATE geos)
-target_compile_definitions(test_sweep_line_speed PRIVATE "USE_UNSTABLE_GEOS_CPP_API")
diff --git a/tests/perf/CMakeLists.txt b/tests/perf/CMakeLists.txt
index 378f744..11dc524 100644
--- a/tests/perf/CMakeLists.txt
+++ b/tests/perf/CMakeLists.txt
@@ -11,7 +11,6 @@
add_executable(test_perf_class_sizes ClassSizes.cpp)
target_link_libraries(test_perf_class_sizes PRIVATE geos)
add_test(NAME test_perf_class_sizes COMMAND test_perf_class_sizes)
-target_compile_definitions(test_perf_class_sizes PRIVATE "USE_UNSTABLE_GEOS_CPP_API")
add_subdirectory(operation)
add_subdirectory(capi)
diff --git a/tests/perf/capi/CMakeLists.txt b/tests/perf/capi/CMakeLists.txt
index 014a4cc..3b85d89 100644
--- a/tests/perf/capi/CMakeLists.txt
+++ b/tests/perf/capi/CMakeLists.txt
@@ -17,4 +17,3 @@ target_include_directories(test_perf_memleak_mp_prep
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
target_link_libraries(test_perf_memleak_mp_prep PRIVATE geos_c)
add_test(NAME test_perf_memleak_mp_prep COMMAND test_perf_memleak_mp_prep)
-target_compile_definitions(test_perf_memleak_mp_prep PRIVATE "USE_UNSTABLE_GEOS_CPP_API")
diff --git a/tests/perf/operation/buffer/CMakeLists.txt b/tests/perf/operation/buffer/CMakeLists.txt
index b09efe9..de937de 100644
--- a/tests/perf/operation/buffer/CMakeLists.txt
+++ b/tests/perf/operation/buffer/CMakeLists.txt
@@ -11,4 +11,3 @@
add_executable(test_perf_iterated_buffer IteratedBufferStressTest.cpp)
target_link_libraries(test_perf_iterated_buffer PRIVATE geos)
add_test(NAME test_perf_iterated_buffer COMMAND test_perf_iterated_buffer)
-target_compile_definitions(test_perf_iterated_buffer PRIVATE "USE_UNSTABLE_GEOS_CPP_API")
diff --git a/tests/perf/operation/predicate/CMakeLists.txt b/tests/perf/operation/predicate/CMakeLists.txt
index 72f7a8a..2ce3624 100644
--- a/tests/perf/operation/predicate/CMakeLists.txt
+++ b/tests/perf/operation/predicate/CMakeLists.txt
@@ -11,4 +11,3 @@
add_executable(test_perf_rectangle_intersects RectangleIntersectsPerfTest.cpp)
target_link_libraries(test_perf_rectangle_intersects PRIVATE geos)
add_test(NAME test_perf_rectangle_intersects COMMAND test_perf_rectangle_intersects)
-target_compile_definitions(test_perf_rectangle_intersects PRIVATE "USE_UNSTABLE_GEOS_CPP_API")
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 5926cef..307b561 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -17,6 +17,4 @@ target_include_directories(test_geos_unit
PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>)
-target_compile_definitions(test_geos_unit PRIVATE "USE_UNSTABLE_GEOS_CPP_API")
-
add_test(NAME test_geos_unit COMMAND test_geos_unit)
diff --git a/tests/xmltester/CMakeLists.txt b/tests/xmltester/CMakeLists.txt
index 3d41ce2..9fea5aa 100644
--- a/tests/xmltester/CMakeLists.txt
+++ b/tests/xmltester/CMakeLists.txt
@@ -11,7 +11,6 @@
add_executable(test_simplewkttester SimpleWKTTester.cpp)
target_link_libraries(test_simplewkttester PRIVATE geos)
-target_compile_definitions(test_simplewkttester PRIVATE "USE_UNSTABLE_GEOS_CPP_API")
add_executable(test_xmltester)
target_sources(test_xmltester
@@ -25,7 +24,6 @@ target_link_libraries(test_xmltester PRIVATE geos)
target_include_directories(test_xmltester
PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/tinyxml)
-target_compile_definitions(test_xmltester PRIVATE "USE_UNSTABLE_GEOS_CPP_API")
file(GLOB_RECURSE _tests ${CMAKE_CURRENT_LIST_DIR}/tests/*.xml CONFIGURE_DEPEND)
list(FILTER _tests EXCLUDE REGEX failure)
commit 03d9dddfd1017792086ccb0d2186bdcd56f10419
Author: Daniel Baston <dbaston at gmail.com>
Date: Tue May 21 11:11:35 2019 -0400
Disable ttmath ASM for MSVC
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44db139..f0cf6de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,9 +173,8 @@ target_compile_options(geos_developer_cxx_flags
$<$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>>:-pedantic -Wall -Wextra -Wno-long-long -Wcast-align -Wconversion -Wchar-subscripts -Wdouble-promotion -Wpointer-arith -Wformat -Wformat-security -Wshadow -Wuninitialized -Wunused-parameter -fno-common>
$<$<CXX_COMPILER_ID:GNU>:-fno-implicit-inline-templates>)
-# Disable TTMath ASM support on MinGW (Windows+GCC)
-# due to build issues
-if(MINGW)
+# Disable TTMath ASM support on Windows due to build issues
+if(WIN32)
target_compile_definitions(geos_cxx_flags
INTERFACE TTMATH_NOASM)
endif()
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list