Make Abseil/re2 an opt-in, not required when Abseil is lazily found (#…

…3948) * address #3944, Abseil/re2 being required. It is now an opt-in * missing endif() * WITH_ABSEIL FALSE
PDAL · Jan 19, 2023 · a3a8d6f · a3a8d6f
1 parent 9b810cb
commit a3a8d6f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 22 deletions.
diff --git a/cmake/gtest.cmake b/cmake/gtest.cmake
@@ -4,32 +4,36 @@ if (MSVC)
     option(gtest_force_shared_crt "Always use shared Visual C++ run-time DLL" ON)
 endif()
 
-set(GOOGLETEST_VERSION 1.10.0)
+set(GOOGLETEST_VERSION 1.12.1)
 add_subdirectory(vendor/gtest)
 
 set(FPHSA_NAME_MISMATCHED 1) # Suppress warnings, see https://cmake.org/cmake/help/v3.17/module/FindPackageHandleStandardArgs.html
-find_package(absl QUIET)
-set(FPHSA_NAME_MISMATCHED 0)
 
-if (absl_FOUND)
-    find_package(re2 REQUIRED)
 
-    if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0")
-        cmake_policy(SET CMP0079 NEW)
+if (WITH_ABSEIL)
+    find_package(absl REQUIRED)
+    set(FPHSA_NAME_MISMATCHED 0)
+
+    if (absl_FOUND)
+        find_package(re2 REQUIRED)
+
+        if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0")
+            cmake_policy(SET CMP0079 NEW)
+        endif()
+        target_compile_definitions(gtest PUBLIC GTEST_HAS_ABSL=1)
+        target_compile_definitions(gtest_main PUBLIC GTEST_HAS_ABSL=1)
+        target_link_libraries(gtest PRIVATE absl::algorithm
+                                            absl::base
+                                            absl::flags
+                                            absl::flags_internal
+                                            absl::flags_usage
+                                            absl::flags_commandlineflag
+                                            absl::flags_parse
+                                            absl::debugging
+                                            absl::numeric
+                                            absl::strings
+                                            absl::utility
+                                            absl::failure_signal_handler)
+        target_link_libraries(gtest PUBLIC re2::re2)
     endif()
-    target_compile_definitions(gtest PUBLIC GTEST_HAS_ABSL=1)
-    target_compile_definitions(gtest_main PUBLIC GTEST_HAS_ABSL=1)
-    target_link_libraries(gtest PRIVATE absl::algorithm
-                                        absl::base
-                                        absl::flags
-                                        absl::flags_internal
-                                        absl::flags_usage
-                                        absl::flags_commandlineflag
-                                        absl::flags_parse
-                                        absl::debugging
-                                        absl::numeric
-                                        absl::strings
-                                        absl::utility
-                                        absl::failure_signal_handler)
-    target_link_libraries(gtest PRIVATE re2::re2)
 endif()
diff --git a/cmake/options.cmake b/cmake/options.cmake
@@ -105,6 +105,10 @@ add_feature_info("Unit tests" WITH_TESTS "PDAL unit tests")
 option(ENABLE_CTEST
     "Enable CTest to support submissions of results to CDash at http://cdash.org" FALSE)
 
+option(WITH_ABSEIL
+    "Choose if PDAL should be built with Abseil support for testing" FALSE)
+add_feature_info("Abseil debugging support " WITH_ABSEIL "unit tests")
+
 #
 # Choose dependent options
 #