diff options
| author | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
|---|---|---|
| committer | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
| commit | 788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch) | |
| tree | 173ade0e6960917458afe9dd9fb0c3c2b7f32051 /ports/opusfile | |
| parent | f483ae4c7fd04eed671a1de595374f84175311e9 (diff) | |
| parent | 26a9338c5055193915290527eacb37f2ac7fdcb8 (diff) | |
| download | vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip | |
Merge master
Diffstat (limited to 'ports/opusfile')
| -rw-r--r-- | ports/opusfile/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | ports/opusfile/CONTROL | 16 | ||||
| -rw-r--r-- | ports/opusfile/portfile.cmake | 11 |
3 files changed, 17 insertions, 15 deletions
diff --git a/ports/opusfile/CMakeLists.txt b/ports/opusfile/CMakeLists.txt index 51ea8f894..c70ea98bc 100644 --- a/ports/opusfile/CMakeLists.txt +++ b/ports/opusfile/CMakeLists.txt @@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.4) project(opusfile C) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4267 /wd4244 /wd4090") -set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) find_path(OGG_INCLUDE_DIR ogg/ogg.h) find_library(OGG_LIBRARY ogg) @@ -34,7 +33,7 @@ if(BUILD_OPUSURL) target_compile_definitions(opusurl PRIVATE OP_ENABLE_HTTP) target_include_directories(opusurl PRIVATE include) target_link_libraries(opusurl PRIVATE opusfile OpenSSL::SSL ws2_32.lib crypt32.lib) - + install(TARGETS opusurl RUNTIME DESTINATION bin LIBRARY DESTINATION lib @@ -42,6 +41,6 @@ if(BUILD_OPUSURL) endif() if(NOT OPUSFILE_SKIP_HEADERS) - install(FILES include/opusfile.h + install(FILES include/opusfile.h DESTINATION include/opus) endif() diff --git a/ports/opusfile/CONTROL b/ports/opusfile/CONTROL index 82307c100..65f6bada7 100644 --- a/ports/opusfile/CONTROL +++ b/ports/opusfile/CONTROL @@ -1,8 +1,8 @@ -Source: opusfile -Version: 0.11-1 -Description: Stand-alone decoder library for .opus streams -Build-Depends: libogg, opus - -Feature: opusurl -Description: Support decoding of http(s) streams -Build-Depends: openssl +Source: opusfile
+Version: 0.11-2
+Description: Stand-alone decoder library for .opus streams
+Build-Depends: libogg, opus
+
+Feature: opusurl
+Description: Support decoding of http(s) streams
+Build-Depends: openssl
diff --git a/ports/opusfile/portfile.cmake b/ports/opusfile/portfile.cmake index 30c633ca2..aae9303f8 100644 --- a/ports/opusfile/portfile.cmake +++ b/ports/opusfile/portfile.cmake @@ -1,8 +1,11 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) message(FATAL_ERROR "UWP builds not supported") endif() -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/opusfile @@ -18,11 +21,11 @@ else() set(BUILD_OPUSURL OFF) endif() -vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} +vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DBUILD_OPUSURL=${BUILD_OPUSURL} - OPTIONS_DEBUG + -DBUILD_OPUSURL=${BUILD_OPUSURL} + OPTIONS_DEBUG -DOPUSFILE_SKIP_HEADERS=ON) vcpkg_install_cmake() |