From 94b7676ca5199abeaf4a29a791b06de412757a8c Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Sun, 3 Oct 2021 18:49:56 +0200 Subject: [PATCH] CI fix --- .github/workflows/build_all.yml | 2 +- core/CMakeLists.txt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 34b9b105..a5ead4ba 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -54,7 +54,7 @@ jobs: run: vcpkg install fftw3:x64-windows glew:x64-windows glfw3:x64-windows portaudio:x64-windows - name: Install rtaudio - run: git clone https://github.com/thestk/rtaudio ; cd rtaudio ; mkdir build ; cd build ; cmake .. ; cmake --build . --config Release ; cmake --install . + run: git clone https://github.com/thestk/rtaudio ; cd rtaudio ; git checkout 2f2fca4502d506abc50f6d4473b2836d24cfb1e3 ; mkdir build ; cd build ; cmake .. ; cmake --build . --config Release ; cmake --install . - name: Prepare CMake working-directory: ${{runner.workspace}}/build diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 17f8450d..971e9526 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -100,9 +100,8 @@ else() endif () if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - # TODO: Replace with add_compile_options? - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++") + target_compile_options(sdrpp_core PRIVATE -static) + target_link_options(sdrpp_core PRIVATE -static-libgcc -static-libstdc++) endif () endif ()