solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

CMake: Group compiler-default checks into a function

Browse source
This commit is contained in:
Maarten Bent 2024-01-28 14:17:19 +01:00
parent 8aad6ba37a
commit 57ed33978d
No known key found for this signature in database
GPG key ID: 58AAEE3F4A4FD070
1 changed files with 26 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

56
build/cmake/init.cmake
View file

@ -8,12 +8,7 @@
# Licence: wxWindows licence # Licence: wxWindows licence
############################################################################# #############################################################################
if(DEFINED wxBUILD_CXX_STANDARD AND NOT wxBUILD_CXX_STANDARD STREQUAL COMPILER_DEFAULT) function(checkCompilerDefaults)
set(CMAKE_CXX_STANDARD ${wxBUILD_CXX_STANDARD})
set(CMAKE_CXX_STANDARD_REQUIRED ON)
else()
# If the standard is not set explicitly, check whether we can use C++11
# without any special options.
include(CheckCXXSourceCompiles) include(CheckCXXSourceCompiles)
check_cxx_source_compiles(" check_cxx_source_compiles("
#include <vector> #include <vector>
@ -24,6 +19,28 @@ else()
return v[0]; return v[0];
}" }"
wxHAVE_CXX11) wxHAVE_CXX11)
check_cxx_source_compiles("
#if defined(_MSVC_LANG)
#if _MSVC_LANG < 201703L
#error C++17 support is required
#endif
#elif __cplusplus < 201703L
#error C++17 support is required
#endif
int main() {
[[maybe_unused]] auto unused = 17;
}"
wxHAVE_CXX17)
endfunction()
if(DEFINED wxBUILD_CXX_STANDARD AND NOT wxBUILD_CXX_STANDARD STREQUAL COMPILER_DEFAULT)
set(CMAKE_CXX_STANDARD ${wxBUILD_CXX_STANDARD})
set(CMAKE_CXX_STANDARD_REQUIRED ON)
else()
# If the standard is not set explicitly, check whether we can use C++11
# without any special options.
checkCompilerDefaults()
if(NOT wxHAVE_CXX11) if(NOT wxHAVE_CXX11)
# If not, request it explicitly and let CMake check if it's supported. # If not, request it explicitly and let CMake check if it's supported.
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
@ -505,30 +522,9 @@ if(wxUSE_GUI)
endif() endif()
if(wxUSE_WEBVIEW_CHROMIUM) if(wxUSE_WEBVIEW_CHROMIUM)
# Check for C++17 support as it's required by CEF: we trust # CEF requires C++17: we trust CMAKE_CXX_STANDARD if it is defined,
# CMAKE_CXX_STANDARD if it is defined, but we need to compile a # or the previously tested wxHAVE_CXX17 if the compiler supports C++17 anyway.
# test program if it is not because the compiler could be if(NOT (CMAKE_CXX_STANDARD GREATER_EQUAL 17 OR wxHAVE_CXX17))
# supporting C++17 anyway.
if (DEFINED CMAKE_CXX_STANDARD)
if (CMAKE_CXX_STANDARD GREATER_EQUAL 17)
set(wxHAVE_CXX17 ON)
endif()
else()
check_cxx_source_compiles("
#if defined(_MSVC_LANG)
#if _MSVC_LANG < 201703L
#error C++17 support is required
#endif
#elif __cplusplus < 201703L
#error C++17 support is required
#endif
int main() {
[[maybe_unused]] auto unused = 17;
}"
wxHAVE_CXX17)
endif()
if (NOT wxHAVE_CXX17)
# We shouldn't disable this option as it's disabled by default and # We shouldn't disable this option as it's disabled by default and
# if it is on, it means that CEF is meant to be used, but we can't # if it is on, it means that CEF is meant to be used, but we can't
# continue neither as libcef_dll_wrapper will fail to build # continue neither as libcef_dll_wrapper will fail to build