Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-25 00:43:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'cmake4' of github.com:cjmayo/wxWidgets

Browse Source 
Improve CMake 4 compatibility.

See #25781.
This commit is contained in:
Vadim Zeitlin
2025-09-14 15:03:05 +02:00
parent 9886f14fdb 47e132ec72
commit ad4b3b18b0
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/cmake/functions.cmake
-1
View File
@@ -8,7 +8,6 @@
#############################################################################
include(CMakeDependentOption)
include(CMakeParseArguments) # For compatibility with CMake < 3.4
include(ExternalProject)
include(CMakePrintHelpers)
build/cmake/modules/cotire.cmake
+1 -2
View File
@@ -37,7 +37,7 @@ set(__COTIRE_INCLUDED TRUE)
if (NOT CMAKE_SCRIPT_MODE_FILE)
cmake_policy(PUSH)
endif()
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.5)
if (NOT CMAKE_SCRIPT_MODE_FILE)
cmake_policy(POP)
endif()
@@ -111,7 +111,6 @@ if (POLICY CMP0055)
cmake_policy(SET CMP0055 NEW)
endif()
include(CMakeParseArguments)
include(ProcessorCount)
function (cotire_get_configuration_types _configsVar)
build/cmake/modules/cotire_test/CMakeLists.txt
+3 -6
View File
@@ -1,6 +1,6 @@
# cotire example project
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.5)
if (POLICY CMP0058)
# Ninja requires custom command byproducts to be explicit
@@ -10,11 +10,8 @@ endif()
project (CotireExample)
set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/..")
if (NOT CMAKE_VERSION VERSION_LESS "3.1.0")
set (CMAKE_CXX_STANDARD "98")
set (CMAKE_CXX_EXTENSIONS OFF)
endif()
set (CMAKE_CXX_STANDARD "98")
set (CMAKE_CXX_EXTENSIONS OFF)
include(cotire)