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

Removed VCPKG option

Browse source
This commit is contained in:
redtide 2023-05-30 10:41:58 +02:00
parent 8b4ef10bcf
commit 1fb62d5043
No known key found for this signature in database
4 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -31,7 +31,6 @@ option_ex(SFIZZ_DEMOS "Enable feature demos build" OFF)
option_ex(SFIZZ_DEVTOOLS "Enable developer tools build" OFF) option_ex(SFIZZ_DEVTOOLS "Enable developer tools build" OFF)
option_ex(SFIZZ_SHARED "Enable shared library build" ON) option_ex(SFIZZ_SHARED "Enable shared library build" ON)
option_ex(SFIZZ_USE_SNDFILE "Enable use of the sndfile library" OFF) option_ex(SFIZZ_USE_SNDFILE "Enable use of the sndfile library" OFF)
option_ex(SFIZZ_USE_VCPKG "Assume that sfizz is build using vcpkg" OFF)
option_ex(SFIZZ_USE_SYSTEM_ABSEIL "Use Abseil libraries preinstalled on system" OFF) option_ex(SFIZZ_USE_SYSTEM_ABSEIL "Use Abseil libraries preinstalled on system" OFF)
option_ex(SFIZZ_USE_SYSTEM_GHC_FS "Use GHC Filesystem libraries preinstalled on system" OFF) option_ex(SFIZZ_USE_SYSTEM_GHC_FS "Use GHC Filesystem libraries preinstalled on system" OFF)
option_ex(SFIZZ_USE_SYSTEM_SIMDE "Use SIMDe libraries preinstalled on system" OFF) option_ex(SFIZZ_USE_SYSTEM_SIMDE "Use SIMDe libraries preinstalled on system" OFF)

1
cmake/SfizzConfig.cmake
View file

@ -153,7 +153,6 @@ Build devtools: ${SFIZZ_DEVTOOLS}
Use sndfile: ${SFIZZ_USE_SNDFILE} Use sndfile: ${SFIZZ_USE_SNDFILE}
Statically link sndfile: ${SFIZZ_SNDFILE_STATIC} Statically link sndfile: ${SFIZZ_SNDFILE_STATIC}
Use vcpkg: ${SFIZZ_USE_VCPKG}
Use clang libc++: ${USE_LIBCPP} Use clang libc++: ${USE_LIBCPP}
Release asserts: ${SFIZZ_RELEASE_ASSERTS} Release asserts: ${SFIZZ_RELEASE_ASSERTS}

2
cmake/SfizzDeps.cmake
View file

@ -109,7 +109,7 @@ add_library(sfizz::cxxopts ALIAS sfizz_cxxopts)
if(SFIZZ_USE_SNDFILE OR SFIZZ_DEMOS OR SFIZZ_DEVTOOLS OR SFIZZ_BENCHMARKS) if(SFIZZ_USE_SNDFILE OR SFIZZ_DEMOS OR SFIZZ_DEVTOOLS OR SFIZZ_BENCHMARKS)
add_library(sfizz_sndfile INTERFACE) add_library(sfizz_sndfile INTERFACE)
add_library(sfizz::sndfile ALIAS sfizz_sndfile) add_library(sfizz::sndfile ALIAS sfizz_sndfile)
if(SFIZZ_USE_VCPKG OR CMAKE_CXX_COMPILER_ID MATCHES "MSVC") if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
find_package(SndFile CONFIG REQUIRED) find_package(SndFile CONFIG REQUIRED)
find_path(SNDFILE_INCLUDE_DIR "sndfile.hh") find_path(SNDFILE_INCLUDE_DIR "sndfile.hh")
target_include_directories(sfizz_sndfile INTERFACE "${SNDFILE_INCLUDE_DIR}") target_include_directories(sfizz_sndfile INTERFACE "${SNDFILE_INCLUDE_DIR}")

6
scripts/x64-linux-hidden.cmake
View file

@ -1,6 +0,0 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE static)
set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_CMAKE_SYSTEM_NAME Linux)
set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -fvisibility=hidden")
set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -fvisibility=hidden")