sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always force vendor abseil to be built statically

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-03-11 11:45:51 +01:00
parent 1e3b85827e
commit 48cc74b2a3
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/build.yml vendored
View file

@ -72,8 +72,7 @@ jobs:
-DSFIZZ_SHARED=OFF \ -DSFIZZ_SHARED=OFF \
-DSFIZZ_STATIC_DEPENDENCIES=OFF \ -DSFIZZ_STATIC_DEPENDENCIES=OFF \
-DSFIZZ_LV2=ON \ -DSFIZZ_LV2=ON \
-DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_STANDARD=17
-DBUILD_SHARED_LIBS=OFF
- name: Build - name: Build
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
@ -119,8 +118,7 @@ jobs:
run: | run: |
mod-plugin-builder /usr/local/bin/cmake "$GITHUB_WORKSPACE" \ mod-plugin-builder /usr/local/bin/cmake "$GITHUB_WORKSPACE" \
-DSFIZZ_SYSTEM_PROCESSOR=armv7-a \ -DSFIZZ_SYSTEM_PROCESSOR=armv7-a \
-DCMAKE_BUILD_TYPE=Release -DSFIZZ_JACK=OFF -DSFIZZ_VST=OFF -DSFIZZ_LV2_UI=OFF \ -DCMAKE_BUILD_TYPE=Release -DSFIZZ_JACK=OFF -DSFIZZ_VST=OFF -DSFIZZ_LV2_UI=OFF
-DBUILD_SHARED_LIBS=OFF
- name: Build - name: Build
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
@ -189,8 +187,7 @@ jobs:
-DSFIZZ_JACK=OFF \ -DSFIZZ_JACK=OFF \
-DSFIZZ_VST=ON \ -DSFIZZ_VST=ON \
-DSFIZZ_STATIC_DEPENDENCIES=ON \ -DSFIZZ_STATIC_DEPENDENCIES=ON \
-DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_STANDARD=17
-DBUILD_SHARED_LIBS=OFF
- name: Build - name: Build
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
@ -259,8 +256,7 @@ jobs:
-DSFIZZ_JACK=OFF \ -DSFIZZ_JACK=OFF \
-DSFIZZ_VST=ON \ -DSFIZZ_VST=ON \
-DSFIZZ_STATIC_DEPENDENCIES=ON \ -DSFIZZ_STATIC_DEPENDENCIES=ON \
-DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_STANDARD=17
-DBUILD_SHARED_LIBS=OFF
- name: Build - name: Build
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build

4
cmake/SfizzDeps.cmake
View file

@ -39,7 +39,11 @@ endif()
if(SFIZZ_USE_SYSTEM_ABSEIL) if(SFIZZ_USE_SYSTEM_ABSEIL)
find_package(absl REQUIRED) find_package(absl REQUIRED)
else() else()
function(sfizz_add_vendor_abseil)
set(BUILD_SHARED_LIBS OFF) # only changed at local scope
add_subdirectory("external/abseil-cpp" EXCLUDE_FROM_ALL) add_subdirectory("external/abseil-cpp" EXCLUDE_FROM_ALL)
endfunction()
sfizz_add_vendor_abseil()
endif() endif()
# The jsl utility library for C++ # The jsl utility library for C++

1
scripts/appveyor/before_build.cmd
View file

@ -11,6 +11,5 @@ cmake .. -G"Visual Studio 16 2019" -A"%RELEASE_ARCH%"^
-DSFIZZ_LV2=ON^ -DSFIZZ_LV2=ON^
-DSFIZZ_VST=ON^ -DSFIZZ_VST=ON^
-DCMAKE_BUILD_TYPE=Release^ -DCMAKE_BUILD_TYPE=Release^
-DBUILD_SHARED_LIBS=OFF^
-DVCPKG_TARGET_TRIPLET=%VCPKG_TRIPLET%^ -DVCPKG_TARGET_TRIPLET=%VCPKG_TRIPLET%^
-DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake

1
scripts/appveyor/before_build.sh
View file

@ -10,7 +10,6 @@ cmake -DCMAKE_BUILD_TYPE=Release \
-DSFIZZ_SHARED=OFF \ -DSFIZZ_SHARED=OFF \
-DSFIZZ_TESTS=ON \ -DSFIZZ_TESTS=ON \
-DCMAKE_CXX_STANDARD=14 \ -DCMAKE_CXX_STANDARD=14 \
-DBUILD_SHARED_LIBS=OFF \
-DLV2PLUGIN_INSTALL_DIR=/ \ -DLV2PLUGIN_INSTALL_DIR=/ \
-DVSTPLUGIN_INSTALL_DIR=/ \ -DVSTPLUGIN_INSTALL_DIR=/ \
-DAUPLUGIN_INSTALL_DIR=/ \ -DAUPLUGIN_INSTALL_DIR=/ \