Merge pull request #1993 from philippremy/bits/cmake-minimum-version

Bump every cmake_minimum_required() to 3.25

Author: servantftransperfect

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.25)
 project(aliceVision LANGUAGES C CXX)
 
 option(ALICEVISION_BUILD_DEPENDENCIES "Build all AliceVision dependencies" OFF)
@@ -10,6 +10,9 @@ option(AV_USE_OPENMP "Enable OpenMP" $<$<CXX_COMPILER_ID:"AppleClang">,OFF,ON>)
 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 option(ALICEVISION_INSTALL_MESHROOM_PLUGIN "Install AliceVision's plugin for Meshroom" ON)
 
+# Global policy section
+cmake_policy(SET CMP0135 NEW)    # Improve timestamp handling in ExternalProject_Add()
+
 if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type for AliceVision" FORCE)
 endif()

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.25)
 message("CMake version: ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
 
 # ==============================================================================
@@ -136,8 +136,16 @@ if (WIN32)
     add_definitions(-DNOMINMAX)
     add_definitions(-D_USE_MATH_DEFINES)
     if (MSVC)
+        # MSVC library version
+        cmake_policy(SET CMP0091 NEW)   # Manually choose msvcrt version
+        if(BUILD_SHARED_LIBS)
+            set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+        else()
+            set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+        endif()
         add_compile_options(/bigobj)
         add_compile_options(/MP)
+        add_compile_options(/GR)   # See policy CMP0117: Enable RTTI on MSVC
     endif()
 endif()
 

src/cmake/Helpers.cmake

@@ -40,9 +40,27 @@ function(alicevision_add_library library_name)
         endif()
 
     elseif (BUILD_SHARED_LIBS)
-        cuda_add_library(${library_name} SHARED ${LIBRARY_SOURCES} OPTIONS --compiler-options "-fPIC")
+        if(MSVC)
+            if(CMAKE_BUILD_TYPE MATCHES "Debug")
+                set(CUDA_LIB_OPTIONS --compiler-options "/MDd")
+            else()
+                set(CUDA_LIB_OPTIONS --compiler-options "/MD")
+            endif()
+        else()
+            set(CUDA_LIB_OPTIONS --compiler-options "-fPIC")
+        endif()
+        cuda_add_library(${library_name} SHARED ${LIBRARY_SOURCES} OPTIONS ${CUDA_LIB_OPTIONS})
     else()
-        cuda_add_library(${library_name} ${LIBRARY_SOURCES})
+        if(MSVC)
+            if(CMAKE_BUILD_TYPE MATCHES "Debug")
+                set(CUDA_LIB_OPTIONS --compiler-options "/MTd")
+            else()
+                set(CUDA_LIB_OPTIONS --compiler-options "/MT")
+            endif()
+        else()
+            set(CUDA_LIB_OPTIONS --compiler-options "-fPIC")
+        endif()
+        cuda_add_library(${library_name} ${LIBRARY_SOURCES} OPTIONS ${CUDA_LIB_OPTIONS})
     endif()
 
     if (ALICEVISION_REMOVE_ABSOLUTE)

src/cmake/MakeBundle.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.25)
 # Perform bundle fixup on all executables of an install directory
 # and generates a standalone bundle with all required runtime dependencies.
 #

src/dependencies/MeshSDFilter/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.25)
 
 project(SDFilter)
 

src/dependencies/vectorGraphics/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.25)
 
 add_executable(main_svgSample main.cpp)
 

src/software/utils/aliceVisionAs3rdParty/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.25)
 
 project(AliceVisionAs3rdParty)