Merge pull request #21791 from luckeverda/fix/geocmake

fix: undo libgeos's setting of global CMAKE_CXX_STANDARD

contrib/CMakeLists.txt

@@ -175,8 +175,8 @@ if(${BUILD_TEST})
             PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cpp-stub/src_darwin>
         )
     endif(${TD_DARWIN})
-    
-    
+
+
 endif(${BUILD_TEST})
 
 # cJson
@@ -245,7 +245,7 @@ if(${BUILD_WITH_ROCKSDB})
     endif(${TD_DARWIN_ARM64})
 
     if (${TD_WINDOWS})
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819")  
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819")
     endif(${TD_WINDOWS})
 
 
@@ -263,8 +263,8 @@ if(${BUILD_WITH_ROCKSDB})
         option(WITH_MD_LIBRARY "build with MD" OFF)
         set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
     endif(${TD_WINDOWS})
-    
-    
+
+
     option(WITH_FALLOCATE "" OFF)
     option(WITH_JEMALLOC "" OFF)
     option(WITH_GFLAGS "" OFF)
@@ -276,7 +276,7 @@ if(${BUILD_WITH_ROCKSDB})
     option(WITH_BENCHMARK_TOOLS "" OFF)
     option(WITH_TOOLS "" OFF)
     option(WITH_LIBURING "" OFF)
-    IF (TD_LINUX) 
+    IF (TD_LINUX)
     option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
     ELSE()
     option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
@@ -294,10 +294,10 @@ if(${BUILD_WITH_LUCENE})
     option(ENABLE_TEST "Enable the tests" OFF)
     add_subdirectory(lucene EXCLUDE_FROM_ALL)
     target_include_directories(
-      lucene++ 
+      lucene++
       PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lucene/include>
-    ) 
-     
+    )
+
 endif(${BUILD_WITH_LUCENE})
 
 # NuRaft
@@ -357,7 +357,7 @@ if(${BUILD_MSVCREGEX})
     target_include_directories(msvcregex
         PRIVATE "msvcregex"
     )
-    target_link_libraries(msvcregex 
+    target_link_libraries(msvcregex
         INTERFACE Shell32
     )
     SET_TARGET_PROPERTIES(msvcregex PROPERTIES OUTPUT_NAME msvcregex)
@@ -417,8 +417,8 @@ if(${BUILD_WITH_BDB})
         IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/bdb/libdb.a"
         INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/bdb"
     )
-    target_link_libraries(bdb 
-        INTERFACE pthread 
+    target_link_libraries(bdb
+        INTERFACE pthread
     )
 endif(${BUILD_WITH_BDB})
 
@@ -430,12 +430,12 @@ if(${BUILD_WITH_SQLITE})
         IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/sqlite/.libs/libsqlite3.a"
         INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/sqlite"
     )
-    target_link_libraries(sqlite 
-        INTERFACE m 
-        INTERFACE pthread 
+    target_link_libraries(sqlite
+        INTERFACE m
+        INTERFACE pthread
     )
     if(NOT TD_WINDOWS)
-        target_link_libraries(sqlite 
+        target_link_libraries(sqlite
             INTERFACE dl
         )
     endif(NOT TD_WINDOWS)
@@ -443,22 +443,22 @@ endif(${BUILD_WITH_SQLITE})
 
 # addr2line
 if(${BUILD_ADDR2LINE})
-    if(NOT ${TD_WINDOWS})    
-        check_include_file( "sys/types.h"     HAVE_SYS_TYPES_H) 
-        check_include_file( "sys/stat.h"      HAVE_SYS_STAT_H ) 
-        check_include_file( "inttypes.h"      HAVE_INTTYPES_H   ) 
-        check_include_file( "stddef.h"        HAVE_STDDEF_H   ) 
-        check_include_file( "stdlib.h"        HAVE_STDLIB_H   ) 
-        check_include_file( "string.h"        HAVE_STRING_H   ) 
-        check_include_file( "memory.h"        HAVE_MEMORY_H   ) 
-        check_include_file( "strings.h"       HAVE_STRINGS_H  ) 
+    if(NOT ${TD_WINDOWS})
+        check_include_file( "sys/types.h"     HAVE_SYS_TYPES_H)
+        check_include_file( "sys/stat.h"      HAVE_SYS_STAT_H )
+        check_include_file( "inttypes.h"      HAVE_INTTYPES_H   )
+        check_include_file( "stddef.h"        HAVE_STDDEF_H   )
+        check_include_file( "stdlib.h"        HAVE_STDLIB_H   )
+        check_include_file( "string.h"        HAVE_STRING_H   )
+        check_include_file( "memory.h"        HAVE_MEMORY_H   )
+        check_include_file( "strings.h"       HAVE_STRINGS_H  )
         check_include_file( "stdint.h"        HAVE_STDINT_H   )
         check_include_file( "unistd.h"        HAVE_UNISTD_H   )
         check_include_file( "sgidefs.h"       HAVE_SGIDEFS_H  )
         check_include_file( "stdafx.h"        HAVE_STDAFX_H   )
-        check_include_file( "elf.h"           HAVE_ELF_H      ) 
-        check_include_file( "libelf.h"        HAVE_LIBELF_H   ) 
-        check_include_file( "libelf/libelf.h" HAVE_LIBELF_LIBELF_H) 
+        check_include_file( "elf.h"           HAVE_ELF_H      )
+        check_include_file( "libelf.h"        HAVE_LIBELF_H   )
+        check_include_file( "libelf/libelf.h" HAVE_LIBELF_LIBELF_H)
         check_include_file( "alloca.h"        HAVE_ALLOCA_H   )
         check_include_file( "elfaccess.h"     HAVE_ELFACCESS_H)
         check_include_file( "sys/elf_386.h"   HAVE_SYS_ELF_386_H  )
@@ -466,7 +466,7 @@ if(${BUILD_ADDR2LINE})
         check_include_file( "sys/elf_sparc.h" HAVE_SYS_ELF_SPARC_H)
         check_include_file( "sys/ia64/elf.h"  HAVE_SYS_IA64_ELF_H )
         set(VERSION 0.3.1)
-        set(PACKAGE_VERSION "\"${VERSION}\"") 
+        set(PACKAGE_VERSION "\"${VERSION}\"")
         configure_file(libdwarf/cmake/config.h.cmake config.h)
         file(GLOB_RECURSE LIBDWARF_SOURCES "libdwarf/src/lib/libdwarf/*.c")
         add_library(libdwarf STATIC ${LIBDWARF_SOURCES})
@@ -497,6 +497,7 @@ if(${BUILD_GEOS})
     endif(${TD_LINUX})
     option(BUILD_SHARED_LIBS "Build GEOS with shared libraries" OFF)
     add_subdirectory(geos EXCLUDE_FROM_ALL)
+    unset(CMAKE_CXX_STANDARD CACHE) # undo libgeos's setting of global CMAKE_CXX_STANDARD
     target_include_directories(
         geos_c
         PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/geos/include>