From f0e80270bf02eccfc7fa1e9a7edc2f260c370f94 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Tue, 7 May 2019 11:01:20 +0100 Subject: [PATCH] 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 --- CMakeLists.txt | 8 ++++---- scripts/target_post.cmake | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 266d91a..206fee1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.3) set(CMAKE_CXX_STANDARD_REQUIRED ON) 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_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++") SET(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") @@ -68,9 +68,9 @@ add_library(FFTLIB STATIC ${FFT_SOURCES}) target_link_libraries( FFTLIB PRIVATE ${FFT_LINK} ) -# target_compile_features( -# FFTLIB PRIVATE "$<$>: -mavx -msse -msse2 -msse3 -msse4>" -# ) + target_compile_options( + FFTLIB PRIVATE $<$>:-mavx -msse -msse2 -msse3 -msse4> + ) add_library(FLUID_SC_WRAPPER INTERFACE) target_sources(FLUID_SC_WRAPPER diff --git a/scripts/target_post.cmake b/scripts/target_post.cmake index efa7fa3..e0f3481 100644 --- a/scripts/target_post.cmake +++ b/scripts/target_post.cmake @@ -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(-mavx2 HAS_AVX2) - target_compile_features( + target_compile_options( ${PLUGIN} PUBLIC "$<$>: -mavx -msse -msse2 -msse3 -msse4>"