Cmake changes

nix
Owen Green 7 years ago
parent 75909fdfa0
commit 1dc5b98410

@ -5,15 +5,18 @@ cmake_minimum_required(VERSION 3.3)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -mavx -msse -msse2 -msse3 -msse4") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx -msse -msse2 -msse3 -msse4")
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++")
SET(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") SET(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7" CACHE STRING "Minimum OS X deployment version") set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7" CACHE STRING "Minimum OS X deployment version")
endif()
project (fluid_decomposition_supercollider LANGUAGES CXX) project (fluid_decomposition_supercollider LANGUAGES CXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic") # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
option(SUPERNOVA "Build plugins for supernova" OFF) option(SUPERNOVA "Build plugins for supernova" OFF)

@ -1,9 +1,9 @@
if(MSVC) # if(MSVC)
target_compile_options(${PLUGIN} PRIVATE /W4 /WX) # target_compile_options(${PLUGIN} PRIVATE /W4 /WX)
else() # else()
target_compile_options(${PLUGIN} PRIVATE -Wall -Wextra -Wpedantic -Wreturn-type -Wconversion) # target_compile_options(${PLUGIN} PRIVATE -Wall -Wextra -Wpedantic -Wreturn-type -Wconversion)
endif() # endif()
target_link_libraries( target_link_libraries(
${PLUGIN} ${PLUGIN}
@ -38,7 +38,7 @@ if (SUPERNOVA)
endif() endif()
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG) if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
target_compile_definitions(${PLUGIN} PRIVATE -fvisibility=hidden) target_compile_options(${PLUGIN} PRIVATE -fvisibility=hidden)
include (CheckCXXCompilerFlag) include (CheckCXXCompilerFlag)

Loading…
Cancel
Save