Skip to content

Commit

Permalink
Merge pull request #60048 from m-kuhn/bump_cmake
Browse files Browse the repository at this point in the history
Bump cmake minimum version to 3.23
  • Loading branch information
troopa81 authored Jan 6, 2025
2 parents b3a7f06 + e64e545 commit 61c10d4
Showing 1 changed file with 1 addition and 20 deletions.
21 changes: 1 addition & 20 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
#############################################################
# CMake settings
cmake_minimum_required(VERSION 3.12.0)
cmake_minimum_required(VERSION 3.23.0)
set(CMAKE_COLOR_MAKEFILE ON)
set(CMAKE_AUTORCC ON)
# set path to additional CMake modules
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
# POLICIES
cmake_policy(SET CMP0048 NEW)
cmake_policy(SET CMP0053 NEW)
cmake_policy(SET CMP0071 NEW)
cmake_policy(SET CMP0094 NEW)
if(NOT "${CMAKE_VERSION}" VERSION_LESS "3.27")
cmake_policy(SET CMP0144 NEW)
# include(Dart) still used, as is the "Experimental" target
cmake_policy(SET CMP0145 OLD)
endif()
Expand Down Expand Up @@ -1027,20 +1022,6 @@ if (WITH_CORE)
string(REPLACE "<CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME>" "" CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}")
endif()

#assume we have escaped compiler directives
#eventually we want to change this to new
#since we don't need to jump through so many
#hoops to escape compiler directives then
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
if(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
cmake_policy(SET CMP0063 NEW)
endif()
if(MSVC)
cmake_policy(SET CMP0020 NEW)
endif()
endif()

if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
Expand Down

0 comments on commit 61c10d4

Please sign in to comment.