From e665c617b2eefc094da355c20e7e1570d88108a8 Mon Sep 17 00:00:00 2001 From: atkawa7 Date: Thu, 27 Jul 2017 20:37:19 -0700 Subject: [log4cplus] update --- ports/log4cplus/portfile.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake index 1eb1a7a59..ecd4e5765 100644 --- a/ports/log4cplus/portfile.cmake +++ b/ports/log4cplus/portfile.cmake @@ -1,11 +1,11 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/log4cplus-REL_1_1_3-RC7) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/log4cplus/log4cplus/archive/REL_1_1_3-RC7.zip" - FILENAME "REL_1_1_3-RC7.zip" - SHA512 06320cb2ab6e18e91c6d79a943c9fdcd82b984e8e908e232f0e0e8eca69496f1f3845913107218bc2be356473315f8dfb822a5993bab8efcadfc4819532da823 +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO log4cplus/log4cplus + REF REL_1_2_1-RC2 + SHA512 480a2a61b01e988253c1bf2bb26088030541a63811c8ffbb9e90581d556b717df5220e3ff72eedd27ea704af35218f71f20ceadf4d6d94984b4f56d273b4d3a3 + HEAD_REF master ) -vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} -- cgit v1.2.3 From c1da4fa5298207fd796c3a1eee6b8133391928e7 Mon Sep 17 00:00:00 2001 From: atkawa7 Date: Thu, 27 Jul 2017 21:07:39 -0700 Subject: [log4plus] update and fix cmake --- ports/log4cplus/CONTROL | 2 +- ports/log4cplus/portfile.cmake | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ports/log4cplus/CONTROL b/ports/log4cplus/CONTROL index 2d367a31a..d4af82051 100644 --- a/ports/log4cplus/CONTROL +++ b/ports/log4cplus/CONTROL @@ -1,3 +1,3 @@ Source: log4cplus -Version: 1.1.3-RC7 +Version: REL_1_2_1-RC2 Description: A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake index ecd4e5765..c1c5de3e2 100644 --- a/ports/log4cplus/portfile.cmake +++ b/ports/log4cplus/portfile.cmake @@ -9,12 +9,18 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DLOG4CPLUS_BUILD_TESTING=OFF -DLOG4CPLUS_BUILD_LOGGINGSERVER=OFF -DWITH_UNIT_TESTS=OFF ) vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) + +vcpkg_copy_pdbs() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/log4cplus) -- cgit v1.2.3