diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 5971bec..f7a2c8f 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -66,6 +66,7 @@ jobs: -DCMAKE_CXX_COMPILER=${{ runner.os == 'Windows' && 'cl' || 'g++' }} -DCMAKE_C_COMPILER=${{ runner.os == 'Windows' && 'cl' || 'gcc' }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} + ${{ runner.os == 'Windows' && '-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded' || '' }} ${{ runner.os == 'Linux' && '-DSTANDALONE=TRUE' || '' }} -S ${{ github.workspace }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 20f8275..6ff1e83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.12) +cmake_minimum_required(VERSION 3.15) project(empi CXX C) set(CMAKE_CXX_STANDARD 17) @@ -100,9 +100,6 @@ else() endif() add_executable(empi src/special/empi.cpp) -if(NOT UNIX) - set_property(TARGET empi PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded") -endif() install(TARGETS empi) target_link_libraries(empi empi-cpu fftw3) if(WITH_CUDA)