diff options
Diffstat (limited to 'graphics/s2')
| -rw-r--r-- | graphics/s2/Makefile | 8 | ||||
| -rw-r--r-- | graphics/s2/files/patch-CMakeLists.txt | 58 |
2 files changed, 63 insertions, 3 deletions
diff --git a/graphics/s2/Makefile b/graphics/s2/Makefile index cc20ee33633a..4ccc7a76861a 100644 --- a/graphics/s2/Makefile +++ b/graphics/s2/Makefile @@ -1,7 +1,7 @@ PORTNAME= s2 PORTVERSION= 0.12.0 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= sunpoet@FreeBSD.org @@ -16,21 +16,23 @@ NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= is currently 64-bit only LIB_DEPENDS= libabsl_base.so:devel/abseil +TEST_DEPENDS= googletest>=1.10:devel/googletest -USES= cmake compiler:c++17-lang localbase ssl +USES= cmake:testing compiler:c++17-lang localbase ssl CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17 CMAKE_OFF= BUILD_TESTS \ S2_USE_SYSTEM_INCLUDES \ WITH_PYTHON CMAKE_ON= BUILD_SHARED_LIBS +CMAKE_TESTING_ON= BUILD_TESTS USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} +USE_GITHUB= yes GH_ACCOUNT= google GH_PROJECT= s2geometry -USE_GITHUB= yes OPTIONS_DEFINE= EXAMPLES diff --git a/graphics/s2/files/patch-CMakeLists.txt b/graphics/s2/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..d10c4d130c5e --- /dev/null +++ b/graphics/s2/files/patch-CMakeLists.txt @@ -0,0 +1,58 @@ +--- CMakeLists.txt.orig 2025-02-02 07:37:37 UTC ++++ CMakeLists.txt +@@ -206,7 +206,7 @@ add_library(s2 + src/s2/util/math/mathutil.cc + src/s2/util/units/length-units.cc) + +-if (GOOGLETEST_ROOT) ++if (BUILD_TESTS) + add_library(s2testing STATIC + src/s2/gmock_matchers.cc + src/s2/s2builderutil_testing.cc +@@ -244,7 +244,7 @@ target_link_libraries( + absl::vlog_is_on + ${CMAKE_THREAD_LIBS_INIT}) + +-if (GOOGLETEST_ROOT) ++if (BUILD_TESTS) + target_link_libraries( + s2testing + absl::check +@@ -454,7 +454,7 @@ install(FILES src/s2/util/units/length-units.h + src/s2/util/units/physical-units.h + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/s2/util/units") + +-if (GOOGLETEST_ROOT) ++if (BUILD_TESTS) + set(S2_TARGETS s2 s2testing) + else() + set(S2_TARGETS s2) +@@ -477,15 +477,7 @@ if (BUILD_TESTS) + DESTINATION share/s2/) + + if (BUILD_TESTS) +- if (NOT GOOGLETEST_ROOT) +- message(FATAL_ERROR "BUILD_TESTS requires GOOGLETEST_ROOT") +- endif() +- message("GOOGLETEST_ROOT: ${GOOGLETEST_ROOT}") +- +- add_subdirectory(${GOOGLETEST_ROOT}/googlemock build_gmock) +- include_directories(${GOOGLETEST_ROOT}/googlemock/include) +- include_directories(${GOOGLETEST_ROOT}/googletest/include) +- ++ find_package(GTest REQUIRED) + set(S2TestFiles + src/s2/encoded_s2cell_id_vector_test.cc + src/s2/encoded_s2point_vector_test.cc +@@ -630,7 +622,10 @@ if (BUILD_TESTS) + absl::status + absl::strings + absl::synchronization +- gmock_main) ++ GTest::gtest ++ GTest::gtest_main ++ GTest::gmock ++ GTest::gmock_main) + add_test(${test} ${test}) + endforeach() + endif() |