diff options
| -rw-r--r-- | ports/check/CONTROL | 2 | ||||
| -rw-r--r-- | ports/check/fix-build-debug-mode.patch | 15 | ||||
| -rw-r--r-- | ports/check/portfile.cmake | 15 |
3 files changed, 9 insertions, 23 deletions
diff --git a/ports/check/CONTROL b/ports/check/CONTROL index 8deb787bc..f529ad731 100644 --- a/ports/check/CONTROL +++ b/ports/check/CONTROL @@ -1,3 +1,3 @@ Source: check
-Version: 0.12.0-2
+Version: 0.13.0
Description: A unit testing framework for C
diff --git a/ports/check/fix-build-debug-mode.patch b/ports/check/fix-build-debug-mode.patch deleted file mode 100644 index edf430060..000000000 --- a/ports/check/fix-build-debug-mode.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0d66a5d..3b9a72d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,10 +39,6 @@ set(CHECK_VERSION
-
- set(MEMORY_LEAKING_TESTS_ENABLED 1)
-
--###############################################################################
--# Set build features
--set(CMAKE_BUILD_TYPE Debug)
--
- ###############################################################################
- # Option
- option(CHECK_ENABLE_TESTS
diff --git a/ports/check/portfile.cmake b/ports/check/portfile.cmake index f7561db19..c5271e8f7 100644 --- a/ports/check/portfile.cmake +++ b/ports/check/portfile.cmake @@ -2,11 +2,9 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libcheck/check
- REF 0.12.0
- SHA512 f7b6452b69f999a90e86a8582d980c0c1b74ba5629ee34455724463ba62bfe3501ad0415aa771170f5c638a7a253f123bf87cbef25aadc6569a7a3a4d10fce90
+ REF 0.13.0
+ SHA512 7943021c5bc3b5ca7bc552f6fe1287e384724d69e5bb128d58256692e810b194e506fc1b65ea4fed27d065e2176e7371483e918beb48125abfe3b6f1ca68eb8f
HEAD_REF master
- PATCHES
- fix-build-debug-mode.patch
)
vcpkg_configure_cmake(
@@ -16,8 +14,11 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
-file(RENAME ${CURRENT_PACKAGES_DIR}/cmake/check.cmake ${CURRENT_PACKAGES_DIR}/cmake/check-config.cmake)
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
# cleanup
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
@@ -25,4 +26,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR # Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/check RENAME copyright)
-vcpkg_copy_pdbs()
+vcpkg_copy_pdbs()
\ No newline at end of file |
