kfr

commit 2941be15c401e4099a41d6ef7a8f2f8295a7c756
parent f8ab60b44fc9bf463b0f2f2bd20e62e935294660
Author: d.levin256@gmail.com <d.levin256@gmail.com>
Date:   Mon, 19 Nov 2018 06:22:30 +0000

CMake fixes

Diffstat:
M
CMakeLists.txt
 | 
8
++++++++
M
azure-pipelines.yml
 | 
1
+
M
tests/CMakeLists.txt
 | 
19
+++++++++----------

3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,10 +17,17 @@
 
 cmake_minimum_required(VERSION 3.0)
 
+set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS}" CACHE STRING "compile flags" FORCE)
+
 project(kfr CXX)
 
 message(STATUS "C++ compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} ${CMAKE_CXX_COMPILER} ")
 
+message(STATUS CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR})
+if (MSVC)
+    message(STATUS MSVC)
+endif()
+
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     set(CLANG 1)
 else()
@@ -58,6 +65,7 @@ if (ENABLE_TESTS)
         add_compile_options(-fno-exceptions -fno-rtti )
         if (NOT ARCH_FLAGS)
             add_compile_options(-march=native)
+            message(STATUS "Building for native cpu")
             if(WIN32)
                 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstackrealign -fno-asynchronous-unwind-tables")
             endif()
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -104,6 +104,7 @@ jobs:
   pool: WIN-AVX512
   steps:
   - script: |
+      rmdir /s /q build
       mkdir build
       cd build
       call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -76,17 +76,16 @@ function(add_x86_test NAME FLAGS)
     endif ()
 endfunction()
 
-message(STATUS CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR})
-
 if (ARCH_TESTS)
-    add_x86_test(generic "-march=x86-64 -mno-avx -DCMT_FORCE_GENERIC_CPU")
-    add_x86_test(sse2 "-march=x86-64 -msse2")
-    add_x86_test(sse3 "-march=x86-64 -msse3 -mno-avx")
-    add_x86_test(ssse3 "-march=x86-64 -mssse3 -mno-avx")
-    add_x86_test(sse41 "-march=x86-64 -msse4.1 -mno-avx")
-    add_x86_test(avx "-march=x86-64 -msse4.1 -mavx")
-    add_x86_test(avx2 "-march=x86-64 -msse4.1 -mavx2 -mfma")
-    add_x86_test(avx512 "-march=x86-64 -msse4.1 -mavx2 -mfma -mavx512f -mavx512cd -mavx512bw -mavx512dq -mavx512vl")
+    set (ARCH_RESET "-march=x86-64 -mno-sse3 -mno-ssse3 -mno-sse4.1 -mno-sse4.2 -mno-avx -mno-avx2 -mno-fma -mno-avx512f -mno-avx512cd -mno-avx512bw -mno-avx512dq -mno-avx512vl")
+    add_x86_test(generic "${ARCH_RESET} -DCMT_FORCE_GENERIC_CPU")
+    add_x86_test(sse2 "${ARCH_RESET} -msse2")
+    add_x86_test(sse3 "${ARCH_RESET} -msse3 -mno-avx")
+    add_x86_test(ssse3 "${ARCH_RESET} -mssse3 -mno-avx")
+    add_x86_test(sse41 "${ARCH_RESET} -msse4.1 -mno-avx")
+    add_x86_test(avx "${ARCH_RESET} -msse4.1 -mavx")
+    add_x86_test(avx2 "${ARCH_RESET} -msse4.1 -mavx2 -mfma")
+    add_x86_test(avx512 "${ARCH_RESET} -msse4.1 -mavx2 -mfma -mavx512f -mavx512cd -mavx512bw -mavx512dq -mavx512vl")
 endif()
 
 add_executable(dsp_test dsp_test.cpp ${KFR_SRC} )