diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2019-05-24 19:36:10 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-05-24 10:36:10 -0700 |
| commit | 12a0106d036a2fc40807fe5a39f92a1be0e59e24 (patch) | |
| tree | 29d723ffc47b15379f1dc65f7c021ef58d42c1a9 | |
| parent | a4f94540ae7f54c7ebccf0d816b6f56f514ff941 (diff) | |
| download | vcpkg-12a0106d036a2fc40807fe5a39f92a1be0e59e24.tar.gz vcpkg-12a0106d036a2fc40807fe5a39f92a1be0e59e24.zip | |
[apr-util] Fix logic error. If find_library call is used testing for existance is strange. (#6609)
Especially if APR_LIBRARIES can contain a list. Testing against NOTFOUND is better.
| -rw-r--r-- | ports/apr-util/CONTROL | 2 | ||||
| -rw-r--r-- | ports/apr-util/apr.patch | 13 | ||||
| -rw-r--r-- | ports/apr-util/portfile.cmake | 4 |
3 files changed, 17 insertions, 2 deletions
diff --git a/ports/apr-util/CONTROL b/ports/apr-util/CONTROL index 1ff406efd..80ca3d94d 100644 --- a/ports/apr-util/CONTROL +++ b/ports/apr-util/CONTROL @@ -1,4 +1,4 @@ Source: apr-util -Version: 1.6.0-2 +Version: 1.6.0-3 Description: Apache Portable Runtime (APR) project mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation Build-Depends: expat, apr, openssl diff --git a/ports/apr-util/apr.patch b/ports/apr-util/apr.patch new file mode 100644 index 000000000..5a61cb9f9 --- /dev/null +++ b/ports/apr-util/apr.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 69e45541..19b86129 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -35,7 +35,7 @@ IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h") + MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.")
+ ENDIF()
+ FOREACH(onelib ${APR_LIBRARIES})
+- IF(NOT EXISTS ${onelib})
++ IF(${onelib} MATCHES "NOTFOUND")
+ MESSAGE(FATAL_ERROR "APR library ${onelib} was not found.")
+ ENDIF()
+ ENDFOREACH()
diff --git a/ports/apr-util/portfile.cmake b/ports/apr-util/portfile.cmake index 6ac311d76..0b1c28351 100644 --- a/ports/apr-util/portfile.cmake +++ b/ports/apr-util/portfile.cmake @@ -10,7 +10,9 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-vcpkg-expat.patch" + PATCHES + use-vcpkg-expat.patch + apr.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) |