mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 12:35:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[many ports] Remove _find_package guards that break *_FOUND (#12157)

Browse Source 
* [many ports] Remove _find_package guards that break *_FOUND

* [many ports] Fix incrementing version

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
This commit is contained in:
Vicki Pfau 2020-08-01 17:13:08 -07:00 committed by GitHub
parent d6565e146c
commit b46242ff15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/asiosdk/CONTROL
View File

@ -1,4 +1,4 @@
Source: asiosdk Source: asiosdk
Version: 2.3.3 Version: 2.3.3-1
Homepage: https://www.steinberg.net/en/company/developers.html Homepage: https://www.steinberg.net/en/company/developers.html
Description: ASIO is a low latency audio API from Steinberg. Description: ASIO is a low latency audio API from Steinberg.

4
ports/asiosdk/vcpkg-cmake-wrapper.cmake
View File

@ -1,8 +1,6 @@
set(ASIOSDK_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) set(ASIOSDK_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
if(NOT ASIOSDK_INCLUDE_DIR) _find_package(${ARGS})
_find_package(${ARGS})
endif()
set(CMAKE_MODULE_PATH ${ASIOSDK_PREV_MODULE_PATH}) set(CMAKE_MODULE_PATH ${ASIOSDK_PREV_MODULE_PATH})

2
ports/cudnn/CONTROL
View File

@ -1,6 +1,6 @@
Source: cudnn Source: cudnn
Version: 7.6 Version: 7.6
Port-Version: 1 Port-Version: 2
Description: NVIDIA's cuDNN deep neural network acceleration library Description: NVIDIA's cuDNN deep neural network acceleration library
Build-Depends: cuda Build-Depends: cuda
Supports: (windows|linux)&x64 Supports: (windows|linux)&x64

4
ports/cudnn/vcpkg-cmake-wrapper.cmake
View File

@ -1,8 +1,6 @@
set(CUDNN_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) set(CUDNN_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
if(NOT CUDNN_LIBRARIES) _find_package(${ARGS})
_find_package(${ARGS})
endif()
set(CMAKE_MODULE_PATH ${CUDNN_PREV_MODULE_PATH}) set(CMAKE_MODULE_PATH ${CUDNN_PREV_MODULE_PATH})

2
ports/ffmpeg/CONTROL
View File

@ -1,6 +1,6 @@
Source: ffmpeg Source: ffmpeg
Version: 4.2 Version: 4.2
Port-Version: 14 Port-Version: 16
Build-Depends: zlib Build-Depends: zlib
Homepage: https://ffmpeg.org Homepage: https://ffmpeg.org
Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.

4
ports/ffmpeg/vcpkg-cmake-wrapper.cmake
View File

@ -1,8 +1,6 @@
set(FFMPEG_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) set(FFMPEG_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
if(NOT FFMPEG_LIBRARIES) _find_package(${ARGS})
_find_package(${ARGS})
endif()
set(CMAKE_MODULE_PATH ${FFMPEG_PREV_MODULE_PATH}) set(CMAKE_MODULE_PATH ${FFMPEG_PREV_MODULE_PATH})

2
ports/jxrlib/CONTROL
View File

@ -1,4 +1,4 @@
Source: jxrlib Source: jxrlib
Version: 2019.10.9 Version: 2019.10.9-1
Homepage: https://github.com/4creators/jxrlib Homepage: https://github.com/4creators/jxrlib
Description: Open source implementation of the jpegxr image format standard. Description: Open source implementation of the jpegxr image format standard.

4
ports/jxrlib/vcpkg-cmake-wrapper.cmake
View File

@ -1,8 +1,6 @@
set(JXR_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) set(JXR_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
if(NOT JXR_LIBRARIES) _find_package(${ARGS})
_find_package(${ARGS})
endif()
set(CMAKE_MODULE_PATH ${JXR_PREV_MODULE_PATH}) set(CMAKE_MODULE_PATH ${JXR_PREV_MODULE_PATH})

2
ports/libmodman/CONTROL
View File

@ -1,5 +1,5 @@
Source: libmodman Source: libmodman
Version: 2.0.1-1 Version: 2.0.1-2
Homepage: https://code.google.com/p/libmodman Homepage: https://code.google.com/p/libmodman
Description: a simple library for managing modules Description: a simple library for managing modules

4
ports/libmodman/vcpkg-cmake-wrapper.cmake
View File

@ -1,8 +1,6 @@
set(LIBMODMAN_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) set(LIBMODMAN_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
if(NOT LIBMODMAN_LIBRARIES) _find_package(${ARGS})
_find_package(${ARGS})
endif()
set(CMAKE_MODULE_PATH ${LIBMODMAN_PREV_MODULE_PATH}) set(CMAKE_MODULE_PATH ${LIBMODMAN_PREV_MODULE_PATH})

2
ports/libproxy/CONTROL
View File

@ -1,5 +1,5 @@
Source: libproxy Source: libproxy
Version: 0.4.15-1 Version: 0.4.15-2
Homepage: https://github.com/libproxy/libproxy Homepage: https://github.com/libproxy/libproxy
Description: libproxy is a library that provides automatic proxy configuration management. Description: libproxy is a library that provides automatic proxy configuration management.
Build-Depends: libmodman Build-Depends: libmodman

4
ports/libproxy/vcpkg-cmake-wrapper.cmake
View File

@ -1,8 +1,6 @@
set(LIBPROXY_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) set(LIBPROXY_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
if(NOT LIBPROXY_LIBRARIES) _find_package(${ARGS})
_find_package(${ARGS})
endif()
set(CMAKE_MODULE_PATH ${LIBPROXY_PREV_MODULE_PATH}) set(CMAKE_MODULE_PATH ${LIBPROXY_PREV_MODULE_PATH})

1
ports/openexr/CONTROL
View File

@ -1,5 +1,6 @@
Source: openexr Source: openexr
Version: 2.5.0 Version: 2.5.0
Port-Version: 1
Homepage: https://www.openexr.com/ Homepage: https://www.openexr.com/
Description: OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications Description: OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications
Build-Depends: zlib, python3 Build-Depends: zlib, python3

2
ports/openimageio/CONTROL
View File

@ -1,5 +1,5 @@
Source: openimageio Source: openimageio
Version: 2.1.16.0 Version: 2.1.16.0-1
Homepage: https://github.com/OpenImageIO/oiio Homepage: https://github.com/OpenImageIO/oiio
Description: A library for reading and writing images, and a bunch of related classes, utilities, and application Description: A library for reading and writing images, and a bunch of related classes, utilities, and application
Build-Depends: libjpeg-turbo, tiff, libpng, openexr, boost-thread, boost-smart-ptr, boost-foreach, boost-regex, boost-type-traits, boost-static-assert, boost-unordered, boost-config, boost-algorithm, boost-filesystem, boost-system, boost-thread, boost-asio, boost-random, robin-map, boost-stacktrace, fmt Build-Depends: libjpeg-turbo, tiff, libpng, openexr, boost-thread, boost-smart-ptr, boost-foreach, boost-regex, boost-type-traits, boost-static-assert, boost-unordered, boost-config, boost-algorithm, boost-filesystem, boost-system, boost-thread, boost-asio, boost-random, robin-map, boost-stacktrace, fmt

4
ports/openimageio/vcpkg-cmake-wrapper.cmake
View File

@ -1,8 +1,6 @@
set(OPENIMAGEIO_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) set(OPENIMAGEIO_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
if(NOT OPENIMAGEIO_LIBRARIES) _find_package(${ARGS})
_find_package(${ARGS})
endif()
set(CMAKE_MODULE_PATH ${OPENIMAGEIO_PREV_MODULE_PATH}) set(CMAKE_MODULE_PATH ${OPENIMAGEIO_PREV_MODULE_PATH})

2
ports/stb/CONTROL
View File

@ -1,4 +1,4 @@
Source: stb Source: stb
Version: 2020-02-08 Version: 2020-02-08-1
Homepage: https://github.com/nothings/stb Homepage: https://github.com/nothings/stb
Description: public domain header-only libraries Description: public domain header-only libraries

4
ports/stb/vcpkg-cmake-wrapper.cmake
View File

@ -1,8 +1,6 @@
set(STB_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) set(STB_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
if(NOT Stb_INCLUDE_DIR) _find_package(${ARGS})
_find_package(${ARGS})
endif()
set(CMAKE_MODULE_PATH ${STB_PREV_MODULE_PATH}) set(CMAKE_MODULE_PATH ${STB_PREV_MODULE_PATH})