From 17ee67719711980ab9943314df08e78146c48db6 Mon Sep 17 00:00:00 2001 From: weefuzzy Date: Thu, 6 Jun 2019 20:30:01 +0100 Subject: [PATCH] Acheivable warning level, AVX in release --- CMakeLists.txt | 8 +++++++- scripts/target_post.cmake | 10 ++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a6c4b9d..7b8e648 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,9 +68,15 @@ add_library(FFTLIB STATIC ${FFT_SOURCES}) target_link_libraries( FFTLIB PRIVATE ${FFT_LINK} ) +if(WIN32) target_compile_options( - FFTLIB PRIVATE $<$>:-mavx -msse -msse2 -msse3 -msse4> + FFTLIB PRIVATE $<$>: /arch:AVX> ) +else(WIN32) +target_compile_options( + FFTLIB PRIVATE $<$>: -mavx -msse -msse2 -msse3 -msse4> +) +endif(WIN32) add_library(FLUID_SC_WRAPPER INTERFACE) target_sources(FLUID_SC_WRAPPER diff --git a/scripts/target_post.cmake b/scripts/target_post.cmake index c5cc0e2..36859c8 100644 --- a/scripts/target_post.cmake +++ b/scripts/target_post.cmake @@ -1,6 +1,8 @@ +target_compile_features(${PLUGIN} PUBLIC cxx_std_14) + if(MSVC) - target_compile_options(${PLUGIN} PRIVATE /W4 /WX) + target_compile_options(${PLUGIN} PRIVATE /W4) else() target_compile_options(${PLUGIN} PRIVATE -Wall -Wextra -Wpedantic -Wreturn-type -Wconversion) endif() @@ -74,7 +76,11 @@ endif() if(MSVC) target_compile_options(${PLUGIN} PRIVATE /arch:AVX -D_USE_MATH_DEFINES) -endif() +else(MSVC) +target_compile_options( + ${PLUGIN} PRIVATE $<$>: -mavx -msse -msse2 -msse3 -msse4> +) +endif(MSVC) ####### added the fluid_decomposition