mirror of
https://github.com/vcmi/vcmi.git
synced 2025-02-03 13:01:33 +02:00
Attempt to make macOS c++17 build
This commit is contained in:
parent
63b197b78a
commit
3e94ae1b2b
@ -159,7 +159,7 @@ include(UseDoxygen OPTIONAL)
|
|||||||
# Compile and linking options #
|
# Compile and linking options #
|
||||||
############################################
|
############################################
|
||||||
|
|
||||||
#Enable C++14 Globally
|
#Enable C++17 Globally
|
||||||
set (CMAKE_CXX_STANDARD 17)
|
set (CMAKE_CXX_STANDARD 17)
|
||||||
#General visibility options
|
#General visibility options
|
||||||
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
|
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
|
||||||
@ -224,6 +224,11 @@ if(APPLE_IOS)
|
|||||||
set(CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2")
|
set(CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(APPLE_MACOS)
|
||||||
|
# Not supported by standard library of our current minimal target
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-aligned-allocation")
|
||||||
|
endif()
|
||||||
|
|
||||||
if(MINGW OR MSVC)
|
if(MINGW OR MSVC)
|
||||||
# Windows Vista or newer for FuzzyLite 6 to compile
|
# Windows Vista or newer for FuzzyLite 6 to compile
|
||||||
add_definitions(-D_WIN32_WINNT=0x0600)
|
add_definitions(-D_WIN32_WINNT=0x0600)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user