aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThijs Withaar <thijs.withaar@gmail.com>2019-05-19 19:21:27 +0200
committerThijs Withaar <thijs.withaar@gmail.com>2019-06-27 18:41:28 +0200
commit60b96c3d0c0d99dccd6f710b89212af75f1b948c (patch)
tree3325356ee881c6c7156ec70b3cabd72f35f8e23c
parentf362309178c05c3acde238f2eb2dbc816a195704 (diff)
downloadvcpkg-60b96c3d0c0d99dccd6f710b89212af75f1b948c.tar.gz
vcpkg-60b96c3d0c0d99dccd6f710b89212af75f1b948c.zip
[soxr] Set Cmake options through portfile.cmake rather than a patch.
-rw-r--r--ports/soxr/disable_cmake_settings.patch25
-rw-r--r--ports/soxr/portfile.cmake3
2 files changed, 1 insertions, 27 deletions
diff --git a/ports/soxr/disable_cmake_settings.patch b/ports/soxr/disable_cmake_settings.patch
deleted file mode 100644
index 192e7bf54..000000000
--- a/ports/soxr/disable_cmake_settings.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,10 +40,10 @@
- "Build type, one of: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
- endif ()
-
--option (BUILD_TESTS "Build sanity-tests." ON)
-+option (BUILD_TESTS "Build sanity-tests." OFF)
- option (BUILD_EXAMPLES "Build examples." OFF)
--option (WITH_OPENMP "Include OpenMP threading." ON)
--option (WITH_LSR_BINDINGS "Include a `libsamplerate'-like interface." ON)
-+option (WITH_OPENMP "Include OpenMP threading." OFF)
-+option (WITH_LSR_BINDINGS "Include a `libsamplerate'-like interface." OFF)
-
- cmake_dependent_option (BUILD_SHARED_LIBS
- "Build shared (dynamic) soxr libraries." ON
-@@ -75,7 +75,7 @@
- option (WITH_HI_PREC_CLOCK "Enable high-precision time-base." ON)
- option (WITH_FLOAT_STD_PREC_CLOCK
- "Use floating-point for standard-precision time-base." OFF)
--option (WITH_DEV_TRACE "Enable developer trace capability." ON)
-+option (WITH_DEV_TRACE "Enable developer trace capability." OFF)
- option (WITH_DEV_GPROF "Enable developer grpof output." OFF)
- mark_as_advanced (WITH_HI_PREC_CLOCK WITH_FLOAT_STD_PREC_CLOCK
- WITH_DEV_TRACE WITH_DEV_GPROF)
diff --git a/ports/soxr/portfile.cmake b/ports/soxr/portfile.cmake
index c7c624caa..6dbc65eb8 100644
--- a/ports/soxr/portfile.cmake
+++ b/ports/soxr/portfile.cmake
@@ -28,7 +28,6 @@ vcpkg_extract_source_archive_ex(
# PATCHES
# 001_port_fixes.patch
# 002_more_port_fixes.patch
- disable_cmake_settings.patch
)
vcpkg_configure_cmake(
@@ -37,9 +36,9 @@ vcpkg_configure_cmake(
# OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
# OPTIONS_RELEASE -DOPTIMIZE=1
# OPTIONS_DEBUG -DDEBUGGABLE=1
+ OPTIONS -DBUILD_TESTS=OFF -DWITH_OPENMP=OFF -DWITH_LSR_BINDINGS=OFF
)
-
vcpkg_install_cmake()
# Handle copyright