Ensure 10.7 target on Mac

nix
Owen Green 6 years ago
parent 13642c1a5f
commit 06493ee1c3

@ -17,6 +17,7 @@ set(FLUID_PATH "" CACHE PATH "Optional path to the Fluid Decomposition repo")
if (APPLE) if (APPLE)
set(CMAKE_OSX_ARCHITECTURES x86_64) set(CMAKE_OSX_ARCHITECTURES x86_64)
set(CMAKE_XCODE_GENERATE_SCHEME ON) set(CMAKE_XCODE_GENERATE_SCHEME ON)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7)
endif() endif()
################################################################################ ################################################################################

@ -5,7 +5,7 @@ if(MSVC)
target_compile_options(${PLUGIN} PRIVATE /W3) target_compile_options(${PLUGIN} PRIVATE /W3)
else() else()
target_compile_options(${PLUGIN} PRIVATE target_compile_options(${PLUGIN} PRIVATE
-Wall -Wextra -Wpedantic -Wreturn-type -Wconversion -Wno-conversion -Wno-c++11-narrowing -Wno-sign-compare -Wall -Wextra -Wpedantic -Wreturn-type -Wconversion -Wno-c++11-narrowing
) )
endif() endif()
@ -15,6 +15,14 @@ set_target_properties(${PLUGIN} PROPERTIES
CXX_EXTENSIONS NO CXX_EXTENSIONS NO
) )
if(APPLE)
set_target_properties(${PLUGIN} PROPERTIES
XCODE_GENERATE_SCHEME ON
)
#If we target 10.7 (actually < 10.9), we have to manually include this:
target_compile_options(${PLUGIN} PRIVATE -stdlib=libc++)
endif()
target_link_libraries( target_link_libraries(
${PLUGIN} ${PLUGIN}
PRIVATE PRIVATE

Loading…
Cancel
Save