diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 85f104fb..cfd21976 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,8 +72,7 @@ jobs: -DSFIZZ_SHARED=OFF \ -DSFIZZ_STATIC_DEPENDENCIES=OFF \ -DSFIZZ_LV2=ON \ - -DCMAKE_CXX_STANDARD=17 \ - -DBUILD_SHARED_LIBS=OFF + -DCMAKE_CXX_STANDARD=17 - name: Build shell: bash working-directory: ${{runner.workspace}}/build @@ -119,8 +118,7 @@ jobs: run: | mod-plugin-builder /usr/local/bin/cmake "$GITHUB_WORKSPACE" \ -DSFIZZ_SYSTEM_PROCESSOR=armv7-a \ - -DCMAKE_BUILD_TYPE=Release -DSFIZZ_JACK=OFF -DSFIZZ_VST=OFF -DSFIZZ_LV2_UI=OFF \ - -DBUILD_SHARED_LIBS=OFF + -DCMAKE_BUILD_TYPE=Release -DSFIZZ_JACK=OFF -DSFIZZ_VST=OFF -DSFIZZ_LV2_UI=OFF - name: Build shell: bash working-directory: ${{runner.workspace}}/build @@ -189,8 +187,7 @@ jobs: -DSFIZZ_JACK=OFF \ -DSFIZZ_VST=ON \ -DSFIZZ_STATIC_DEPENDENCIES=ON \ - -DCMAKE_CXX_STANDARD=17 \ - -DBUILD_SHARED_LIBS=OFF + -DCMAKE_CXX_STANDARD=17 - name: Build shell: bash working-directory: ${{runner.workspace}}/build @@ -259,8 +256,7 @@ jobs: -DSFIZZ_JACK=OFF \ -DSFIZZ_VST=ON \ -DSFIZZ_STATIC_DEPENDENCIES=ON \ - -DCMAKE_CXX_STANDARD=17 \ - -DBUILD_SHARED_LIBS=OFF + -DCMAKE_CXX_STANDARD=17 - name: Build shell: bash working-directory: ${{runner.workspace}}/build diff --git a/cmake/SfizzDeps.cmake b/cmake/SfizzDeps.cmake index dc39f499..664286c1 100644 --- a/cmake/SfizzDeps.cmake +++ b/cmake/SfizzDeps.cmake @@ -39,7 +39,11 @@ endif() if(SFIZZ_USE_SYSTEM_ABSEIL) find_package(absl REQUIRED) else() - add_subdirectory("external/abseil-cpp" EXCLUDE_FROM_ALL) + function(sfizz_add_vendor_abseil) + set(BUILD_SHARED_LIBS OFF) # only changed at local scope + add_subdirectory("external/abseil-cpp" EXCLUDE_FROM_ALL) + endfunction() + sfizz_add_vendor_abseil() endif() # The jsl utility library for C++ diff --git a/scripts/appveyor/before_build.cmd b/scripts/appveyor/before_build.cmd index 8742946c..0b7804cd 100644 --- a/scripts/appveyor/before_build.cmd +++ b/scripts/appveyor/before_build.cmd @@ -11,6 +11,5 @@ cmake .. -G"Visual Studio 16 2019" -A"%RELEASE_ARCH%"^ -DSFIZZ_LV2=ON^ -DSFIZZ_VST=ON^ -DCMAKE_BUILD_TYPE=Release^ - -DBUILD_SHARED_LIBS=OFF^ -DVCPKG_TARGET_TRIPLET=%VCPKG_TRIPLET%^ -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake diff --git a/scripts/appveyor/before_build.sh b/scripts/appveyor/before_build.sh index 48e2e70a..213ab8a3 100644 --- a/scripts/appveyor/before_build.sh +++ b/scripts/appveyor/before_build.sh @@ -10,7 +10,6 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DSFIZZ_SHARED=OFF \ -DSFIZZ_TESTS=ON \ -DCMAKE_CXX_STANDARD=14 \ - -DBUILD_SHARED_LIBS=OFF \ -DLV2PLUGIN_INSTALL_DIR=/ \ -DVSTPLUGIN_INSTALL_DIR=/ \ -DAUPLUGIN_INSTALL_DIR=/ \