diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-07-02 11:00:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-02 11:00:28 -0700 |
| commit | ef91134964e8ddec77cd0db8943b72e0eaac2ef7 (patch) | |
| tree | 469e68094f10d9d41629e66146ddf285fc02d65a /ports/cmocka | |
| parent | 77617e31e31189467823fd83a76d8022f3158935 (diff) | |
| download | vcpkg-ef91134964e8ddec77cd0db8943b72e0eaac2ef7.tar.gz vcpkg-ef91134964e8ddec77cd0db8943b72e0eaac2ef7.zip | |
[cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers (#12196)
* fix drive-by error in vcpkg-cmake-wrappers
* rev port versions
Diffstat (limited to 'ports/cmocka')
| -rw-r--r-- | ports/cmocka/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cmocka/vcpkg-cmake-wrapper.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/cmocka/CONTROL b/ports/cmocka/CONTROL index d04945aa5..090b8ca79 100644 --- a/ports/cmocka/CONTROL +++ b/ports/cmocka/CONTROL @@ -1,4 +1,4 @@ Source: cmocka
Version: 1.1.5
-Port-Version: 2
+Port-Version: 3
Description: An elegant unit testing framework for C with support for mock objects
diff --git a/ports/cmocka/vcpkg-cmake-wrapper.cmake b/ports/cmocka/vcpkg-cmake-wrapper.cmake index c5626845b..49b486ff8 100644 --- a/ports/cmocka/vcpkg-cmake-wrapper.cmake +++ b/ports/cmocka/vcpkg-cmake-wrapper.cmake @@ -3,8 +3,8 @@ _find_package(${ARGS}) get_filename_component(_cmocka_lib_name ${CMOCKA_LIBRARY} NAME)
set(CMOCKA_LIBRARY
- debug ${CURRENT_INSTALLED_DIR}/debug/lib/${_cmocka_lib_name}
- optimized ${CURRENT_INSTALLED_DIR}/lib/${_cmocka_lib_name}
+ debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/${_cmocka_lib_name}
+ optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/${_cmocka_lib_name}
)
set(CMOCKA_LIBRARIES ${CMOCKA_LIBRARY})
|