Merge branch 'main' of https://github.com/colmap/glomap into user/jsch/view-graph-simplifcation

Author: ahojnnes

.github/workflows/mac.yml

@@ -17,7 +17,7 @@ jobs:
       matrix:
         config: [
           {
-            os: macos-14,
+            os: macos-15,
             arch: arm64,
             cmakeBuildType: Release,
           },

.github/workflows/windows.yml

@@ -17,14 +17,7 @@ jobs:
       matrix:
         config: [
           {
-            os: windows-2022,
-            cmakeBuildType: Release,
-            cudaEnabled: true,
-            testsEnabled: true,
-            exportPackage: true,
-          },
-          {
-            os: windows-2022,
+            os: windows-2025,
             cmakeBuildType: Release,
             cudaEnabled: false,
             testsEnabled: true,
@@ -37,13 +30,13 @@ jobs:
       COMPILER_CACHE_DIR: ${{ github.workspace }}/compiler-cache
       CCACHE_DIR: ${{ github.workspace }}/compiler-cache/ccache
       CCACHE_BASEDIR: ${{ github.workspace }}
-      VCPKG_COMMIT_ID: bc3512a509f9d29b37346a7e7e929f9a26e66c7e
+      VCPKG_COMMIT_ID: 2ad7bd06128280e02bfe02361d8ffd7d465cfcf0
       GLOG_v: 1
       GLOG_logtostderr: 1
 
     steps:
       - uses: actions/checkout@v4
-      
+
       # We define the vcpkg binary sources using separate variables for read and
       # write operations:
       # * Read sources are defined as inline. These can be read by anyone and,
@@ -74,7 +67,7 @@ jobs:
           key: v${{ env.COMPILER_CACHE_VERSION }}-${{ matrix.config.os }}-${{ matrix.config.cmakeBuildType }}-${{ matrix.config.asanEnabled }}--${{ matrix.config.cudaEnabled }}-${{ github.run_id }}-${{ github.run_number }}
           restore-keys: v${{ env.COMPILER_CACHE_VERSION }}-${{ matrix.config.os }}-${{ matrix.config.cmakeBuildType }}-${{ matrix.config.asanEnabled }}--${{ matrix.config.cudaEnabled }}
           path: ${{ env.COMPILER_CACHE_DIR }}
-      
+
       - name: Install ccache
         shell: pwsh
         run: |

CMakeLists.txt

@@ -20,6 +20,17 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set_property(GLOBAL PROPERTY GLOBAL_DEPENDS_NO_CYCLES ON)
 
+# Determine project compiler.
+if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    set(IS_MSVC TRUE)
+endif()
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    set(IS_GNU TRUE)
+endif()
+if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
+    set(IS_CLANG TRUE)
+endif()
+
 include(cmake/FindDependencies.cmake)
 
 if (TESTS_ENABLED)
@@ -45,8 +56,7 @@ else()
     message(STATUS "Disabling ccache support")
 endif()
 
-
-if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+if(IS_MSVC)
     # Some fixes for the Glog library.
     add_definitions("-DGLOG_USE_GLOG_EXPORT")
     add_definitions("-DGLOG_NO_ABBREVIATED_SEVERITIES")
@@ -62,4 +72,5 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     endif()
 endif()
 
+add_subdirectory(thirdparty)
 add_subdirectory(glomap)

glomap/CMakeLists.txt

@@ -96,7 +96,6 @@ if(MSVC)
 else()
     target_compile_options(glomap PRIVATE
         -Wall
-        -Werror
         -Wno-sign-compare
         -Wno-unused-variable
     )

thirdparty/CMakeLists.txt

@@ -0,0 +1,37 @@
+if(IS_GNU OR IS_CLANG)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
+endif()
+
+include(FetchContent)
+
+FetchContent_Declare(poselib
+    GIT_REPOSITORY    https://github.com/PoseLib/PoseLib.git
+    GIT_TAG           f119951fca625133112acde48daffa5f20eba451
+    EXCLUDE_FROM_ALL
+    SYSTEM
+)
+message(STATUS "Configuring PoseLib...")
+if(FETCH_POSELIB)
+    set(MARCH_NATIVE OFF CACHE BOOL "")
+    FetchContent_MakeAvailable(poselib)
+else()
+    find_package(PoseLib REQUIRED)
+endif()
+message(STATUS "Configuring PoseLib... done")
+
+FetchContent_Declare(COLMAP
+    GIT_REPOSITORY    https://github.com/colmap/colmap.git
+    GIT_TAG           b6b7b54eca6078070f73a3f0a084f79c629a6f10  # Nov 20, 2025
+    EXCLUDE_FROM_ALL
+    SYSTEM
+)
+message(STATUS "Configuring COLMAP...")
+set(UNINSTALL_ENABLED OFF CACHE INTERNAL "")
+set(GUI_ENABLED OFF CACHE INTERNAL "")
+if (FETCH_COLMAP)
+    FetchContent_MakeAvailable(COLMAP)
+else()
+    find_package(COLMAP REQUIRED)
+endif()
+message(STATUS "Configuring COLMAP... done")