CMakeLists.txt: FFTLib compiling with GNU stdlib probably Not Good. Fix compiler switches (broken by quotes, but whyyyyy? But also wrong CMake command)

scripts/target_post.cmake: Use right CMake command for compiler goodness
nix
Owen Green 7 years ago
parent fe478d2f12
commit f0e80270bf

@ -4,7 +4,7 @@ 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_EXTENSIONS OFF)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -mavx -msse -msse2 -msse3 -msse4") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -mavx -msse -msse2 -msse3 -msse4")
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++")
@ -68,9 +68,9 @@ add_library(FFTLIB STATIC ${FFT_SOURCES})
target_link_libraries( target_link_libraries(
FFTLIB PRIVATE ${FFT_LINK} FFTLIB PRIVATE ${FFT_LINK}
) )
# target_compile_features( target_compile_options(
# FFTLIB PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>: -mavx -msse -msse2 -msse3 -msse4>" FFTLIB PRIVATE $<$<NOT:$<CONFIG:DEBUG>>:-mavx -msse -msse2 -msse3 -msse4>
# ) )
add_library(FLUID_SC_WRAPPER INTERFACE) add_library(FLUID_SC_WRAPPER INTERFACE)
target_sources(FLUID_SC_WRAPPER target_sources(FLUID_SC_WRAPPER

@ -61,7 +61,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
# CHECK_CXX_COMPILER_FLAG(-mavx HAS_AVX) # CHECK_CXX_COMPILER_FLAG(-mavx HAS_AVX)
# CHECK_CXX_COMPILER_FLAG(-mavx2 HAS_AVX2) # CHECK_CXX_COMPILER_FLAG(-mavx2 HAS_AVX2)
target_compile_features( target_compile_options(
${PLUGIN} ${PLUGIN}
PUBLIC PUBLIC
"$<$<NOT:$<CONFIG:DEBUG>>: -mavx -msse -msse2 -msse3 -msse4>" "$<$<NOT:$<CONFIG:DEBUG>>: -mavx -msse -msse2 -msse3 -msse4>"

Loading…
Cancel
Save