[many ports] Remove _find_package guards that break *_FOUND (microsof…

…t#12157) * [many ports] Remove _find_package guards that break *_FOUND * [many ports] Fix incrementing version Co-authored-by: Jack·Boos·Yu <[email protected]>
hellozee · Sep 11, 2020 · 8c79472 · 8c79472
1 parent a72972d
commit 8c79472
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 32 deletions.
diff --git a/ports/asiosdk/CONTROL b/ports/asiosdk/CONTROL
@@ -1,4 +1,4 @@
 Source: asiosdk
-Version: 2.3.3
+Version: 2.3.3-1
 Homepage: https://www.steinberg.net/en/company/developers.html
 Description: ASIO is a low latency audio API from Steinberg.
diff --git a/ports/asiosdk/vcpkg-cmake-wrapper.cmake b/ports/asiosdk/vcpkg-cmake-wrapper.cmake
@@ -1,8 +1,6 @@
 set(ASIOSDK_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 
-if(NOT ASIOSDK_INCLUDE_DIR)
- _find_package(${ARGS})
-endif()
+_find_package(${ARGS})
 
 set(CMAKE_MODULE_PATH ${ASIOSDK_PREV_MODULE_PATH})
diff --git a/ports/cudnn/CONTROL b/ports/cudnn/CONTROL
@@ -1,6 +1,6 @@
 Source: cudnn
 Version: 7.6
-Port-Version: 1
+Port-Version: 2
 Description: NVIDIA's cuDNN deep neural network acceleration library
 Build-Depends: cuda
 Supports: (windows|linux)&x64
diff --git a/ports/cudnn/vcpkg-cmake-wrapper.cmake b/ports/cudnn/vcpkg-cmake-wrapper.cmake
@@ -1,8 +1,6 @@
 set(CUDNN_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 
-if(NOT CUDNN_LIBRARIES)
- _find_package(${ARGS})
-endif()
+_find_package(${ARGS})
 
 set(CMAKE_MODULE_PATH ${CUDNN_PREV_MODULE_PATH})
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
@@ -1,6 +1,6 @@
 Source: ffmpeg
 Version: 4.2
-Port-Version: 14
+Port-Version: 16
 Build-Depends: zlib
 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.

diff --git a/ports/ffmpeg/vcpkg-cmake-wrapper.cmake b/ports/ffmpeg/vcpkg-cmake-wrapper.cmake
@@ -1,8 +1,6 @@
 set(FFMPEG_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 
-if(NOT FFMPEG_LIBRARIES)
- _find_package(${ARGS})
-endif()
+_find_package(${ARGS})
 
 set(CMAKE_MODULE_PATH ${FFMPEG_PREV_MODULE_PATH})
diff --git a/ports/jxrlib/CONTROL b/ports/jxrlib/CONTROL
@@ -1,4 +1,4 @@
 Source: jxrlib
-Version: 2019.10.9
+Version: 2019.10.9-1
 Homepage: https:/4creators/jxrlib
 Description: Open source implementation of the jpegxr image format standard.
diff --git a/ports/jxrlib/vcpkg-cmake-wrapper.cmake b/ports/jxrlib/vcpkg-cmake-wrapper.cmake
@@ -1,8 +1,6 @@
 set(JXR_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 
-if(NOT JXR_LIBRARIES)
- _find_package(${ARGS})
-endif()
+_find_package(${ARGS})
 
 set(CMAKE_MODULE_PATH ${JXR_PREV_MODULE_PATH})
diff --git a/ports/libmodman/CONTROL b/ports/libmodman/CONTROL
@@ -1,5 +1,5 @@
 Source: libmodman
-Version: 2.0.1-1
+Version: 2.0.1-2
 Homepage: https://code.google.com/p/libmodman
 Description: a simple library for managing modules
 

diff --git a/ports/libmodman/vcpkg-cmake-wrapper.cmake b/ports/libmodman/vcpkg-cmake-wrapper.cmake
@@ -1,8 +1,6 @@
 set(LIBMODMAN_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 
-if(NOT LIBMODMAN_LIBRARIES)
- _find_package(${ARGS})
-endif()
+_find_package(${ARGS})
 
 set(CMAKE_MODULE_PATH ${LIBMODMAN_PREV_MODULE_PATH})
diff --git a/ports/libproxy/CONTROL b/ports/libproxy/CONTROL
@@ -1,5 +1,5 @@
 Source: libproxy
-Version: 0.4.15-1
+Version: 0.4.15-2
 Homepage: https:/libproxy/libproxy
 Description: libproxy is a library that provides automatic proxy configuration management.
 Build-Depends: libmodman

diff --git a/ports/libproxy/vcpkg-cmake-wrapper.cmake b/ports/libproxy/vcpkg-cmake-wrapper.cmake
@@ -1,8 +1,6 @@
 set(LIBPROXY_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 
-if(NOT LIBPROXY_LIBRARIES)
- _find_package(${ARGS})
-endif()
+_find_package(${ARGS})
 
 set(CMAKE_MODULE_PATH ${LIBPROXY_PREV_MODULE_PATH})
diff --git a/ports/openexr/CONTROL b/ports/openexr/CONTROL
@@ -1,5 +1,6 @@
 Source: openexr
 Version: 2.5.0
+Port-Version: 1
 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
 Build-Depends: zlib, python3

diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL
@@ -1,5 +1,5 @@
 Source: openimageio
-Version: 2.1.16.0
+Version: 2.1.16.0-1
 Homepage: https:/OpenImageIO/oiio
 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

diff --git a/ports/openimageio/vcpkg-cmake-wrapper.cmake b/ports/openimageio/vcpkg-cmake-wrapper.cmake
@@ -1,8 +1,6 @@
 set(OPENIMAGEIO_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 
-if(NOT OPENIMAGEIO_LIBRARIES)
- _find_package(${ARGS})
-endif()
+_find_package(${ARGS})
 
 set(CMAKE_MODULE_PATH ${OPENIMAGEIO_PREV_MODULE_PATH})
diff --git a/ports/stb/CONTROL b/ports/stb/CONTROL
@@ -1,4 +1,4 @@
 Source: stb
-Version: 2020-02-08
+Version: 2020-02-08-1
 Homepage: https:/nothings/stb
 Description: public domain header-only libraries
diff --git a/ports/stb/vcpkg-cmake-wrapper.cmake b/ports/stb/vcpkg-cmake-wrapper.cmake
@@ -1,8 +1,6 @@
 set(STB_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 
-if(NOT Stb_INCLUDE_DIR)
- _find_package(${ARGS})
-endif()
+_find_package(${ARGS})
 
 set(CMAKE_MODULE_PATH ${STB_PREV_MODULE_PATH})