diff --git a/CMakeLists.txt b/CMakeLists.txt index c4cec497..bfb761ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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_SHARED "Enable shared library build" ON) 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_GHC_FS "Use GHC Filesystem libraries preinstalled on system" OFF) option_ex(SFIZZ_USE_SYSTEM_SIMDE "Use SIMDe libraries preinstalled on system" OFF) diff --git a/cmake/SfizzConfig.cmake b/cmake/SfizzConfig.cmake index 224c641c..9f8bb462 100644 --- a/cmake/SfizzConfig.cmake +++ b/cmake/SfizzConfig.cmake @@ -153,7 +153,6 @@ Build devtools: ${SFIZZ_DEVTOOLS} Use sndfile: ${SFIZZ_USE_SNDFILE} Statically link sndfile: ${SFIZZ_SNDFILE_STATIC} -Use vcpkg: ${SFIZZ_USE_VCPKG} Use clang libc++: ${USE_LIBCPP} Release asserts: ${SFIZZ_RELEASE_ASSERTS} diff --git a/cmake/SfizzDeps.cmake b/cmake/SfizzDeps.cmake index cc317a95..daf3cdee 100644 --- a/cmake/SfizzDeps.cmake +++ b/cmake/SfizzDeps.cmake @@ -109,7 +109,7 @@ add_library(sfizz::cxxopts ALIAS sfizz_cxxopts) if(SFIZZ_USE_SNDFILE OR SFIZZ_DEMOS OR SFIZZ_DEVTOOLS OR SFIZZ_BENCHMARKS) add_library(sfizz_sndfile INTERFACE) 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_path(SNDFILE_INCLUDE_DIR "sndfile.hh") target_include_directories(sfizz_sndfile INTERFACE "${SNDFILE_INCLUDE_DIR}") diff --git a/scripts/x64-linux-hidden.cmake b/scripts/x64-linux-hidden.cmake deleted file mode 100644 index f7535c0c..00000000 --- a/scripts/x64-linux-hidden.cmake +++ /dev/null @@ -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")