diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-05-02 22:57:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 22:57:43 -0700 |
| commit | 050e71d01dc9e65e6cdf1d13534fc14889e4ae38 (patch) | |
| tree | 7e39943693b8ac392f37d43a03c66815c6048963 /ports/opusfile | |
| parent | b72f36e8cdd96ec482785e33f72f99cceebda8ad (diff) | |
| download | vcpkg-050e71d01dc9e65e6cdf1d13534fc14889e4ae38.tar.gz vcpkg-050e71d01dc9e65e6cdf1d13534fc14889e4ae38.zip | |
Remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS (#5937)
* [various ports] remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS
* [alac,benchmark,capnproto] Fix check_linkage call
* [fastlz] Fix SHA512
* [coroutine] Fix dynamic build
* [folly] Find double-conversion
* [gamma] Use vcpkg_from_github
* [librsync] Enable static builds
* [netcdf-cxx4] Fix SHA512
* [octomap] Fix static build
* [tidy-html5] Fix static build
* [various ports] remove custom messages for shared/static builds, modernize some scripts in the meantime
* [folly] Use ras0219's fix for link paths
* [octomap] Fix exported targets
* [uvatlas] Set tool download SHA512
* [duktape+python2] fix portfile to call configure with correct python version, manage python2 also outside win32
* [suitesparse] osx fix
* [gtkmm] Call vcpkg_check_linkage after including vcpkg functions
* [duktape] Resolve conflicts
* [duktape] FIxed typo in Python paths
* [wangle] Find zlib
* [openssl-uwp] Fix SHA512
* [glib] Allow static builds on non-Windows
* [suitesparse] Fix build on Windows
* [multiple ports] Bump CONTROL version
* [multiple ports] Fix description indent
* [directxtk] Fix CONTROL file
* [bde,duktape,qpid-proton] Build packages with python2 installed
* [binn] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS
* [gdal,live555,uriparser] Fix regressions
* [live555] Update to 2019.04.24
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() |
