Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Add variable to indicate if c++11 or later is enabled

Browse Source 
Use it in macOS checks.
This commit is contained in:
Maarten Bent
2020-04-07 00:14:45 +02:00
parent c8209a5111
commit 5c2d186132
3 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/cmake/functions.cmake
View File

@@ -77,12 +77,7 @@ endmacro()
function(wx_set_common_target_properties target_name) function(wx_set_common_target_properties target_name)
cmake_parse_arguments(wxCOMMON_TARGET_PROPS "DEFAULT_WARNINGS" "" "" ${ARGN}) cmake_parse_arguments(wxCOMMON_TARGET_PROPS "DEFAULT_WARNINGS" "" "" ${ARGN})
if(DEFINED wxBUILD_CXX_STANDARD AND NOT wxBUILD_CXX_STANDARD STREQUAL COMPILER_DEFAULT) if(APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.9 AND wxHAS_CXX11)
if(
APPLE AND
CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.9 AND
(wxBUILD_CXX_STANDARD EQUAL 11 OR wxBUILD_CXX_STANDARD EQUAL 14)
)
if(CMAKE_GENERATOR STREQUAL "Xcode") if(CMAKE_GENERATOR STREQUAL "Xcode")
set_target_properties(${target_name} PROPERTIES XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY libc++) set_target_properties(${target_name} PROPERTIES XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY libc++)
else() else()
@@ -90,7 +85,6 @@ function(wx_set_common_target_properties target_name)
target_link_libraries(${target_name} PRIVATE "-stdlib=libc++") target_link_libraries(${target_name} PRIVATE "-stdlib=libc++")
endif() endif()
endif() endif()
endif()
set_target_properties(${target_name} PROPERTIES set_target_properties(${target_name} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}${wxPLATFORM_LIB_DIR}" LIBRARY_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}${wxPLATFORM_LIB_DIR}"
ARCHIVE_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}${wxPLATFORM_LIB_DIR}" ARCHIVE_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}${wxPLATFORM_LIB_DIR}"

5
build/cmake/init.cmake
View File

@@ -11,6 +11,11 @@
if(DEFINED wxBUILD_CXX_STANDARD AND NOT wxBUILD_CXX_STANDARD STREQUAL COMPILER_DEFAULT) if(DEFINED wxBUILD_CXX_STANDARD AND NOT wxBUILD_CXX_STANDARD STREQUAL COMPILER_DEFAULT)
set(CMAKE_CXX_STANDARD ${wxBUILD_CXX_STANDARD}) set(CMAKE_CXX_STANDARD ${wxBUILD_CXX_STANDARD})
endif() endif()
if(NOT CMAKE_CXX_STANDARD EQUAL 98)
set(wxHAS_CXX11 TRUE)
else()
set(wxHAS_CXX11 FALSE)
endif()
if(MSVC) if(MSVC)
# Determine MSVC runtime library flag # Determine MSVC runtime library flag

6
build/cmake/setup.cmake
View File

@@ -23,11 +23,7 @@ include(CheckTypeSize)
include(CMakePushCheckState) include(CMakePushCheckState)
include(TestBigEndian) include(TestBigEndian)
if( if(APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.9 AND wxHAS_CXX11)
APPLE AND
CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.9 AND
(CMAKE_CXX_STANDARD EQUAL 11 OR CMAKE_CXX_STANDARD EQUAL 14)
)
set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-stdlib=libc++") set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-stdlib=libc++")
endif() endif()