diff --git a/CMakeLists.txt b/CMakeLists.txt index 4400929d2..445800d0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,7 +159,7 @@ include(UseDoxygen OPTIONAL) # Compile and linking options # ############################################ -#Enable C++14 Globally +#Enable C++17 Globally set (CMAKE_CXX_STANDARD 17) #General visibility options set(CMAKE_CXX_VISIBILITY_PRESET hidden) @@ -224,6 +224,11 @@ if(APPLE_IOS) set(CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2") 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) # Windows Vista or newer for FuzzyLite 6 to compile add_definitions(-D_WIN32_WINNT=0x0600)