diff --git a/ports/plog/portfile.cmake b/ports/plog/portfile.cmake index 6007c16857..b06b55b711 100644 --- a/ports/plog/portfile.cmake +++ b/ports/plog/portfile.cmake @@ -1,17 +1,20 @@ -# Header-only library -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO SergiusTheBest/plog - REF 1.1.6 - SHA512 5240532df96144d5026d6f879b69f7d6f393ebc9122c6458c41076fd3db998565e45ed2ab4948f8c3cb59e08c0aad7695ee416f95b49fd70209cd937220cdf8b - HEAD_REF master -) - -# Copy header files -file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}" FILES_MATCHING PATTERN "*.h") - -# Copy usage file -file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - -# Put the licence file where vcpkg expects it -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SergiusTheBest/plog + REF 1.1.8 + SHA512 09bf6e0cae7f20c1b42e68a174b4cd6a2fb8751db9758efb87449cbff48375708e43c147c72b7ed17fb9334acaf7802441f61578356284a8ed337fd886a45e79 + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} OPTIONS -DPLOG_BUILD_SAMPLES=OFF) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Copy usage file +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# Put the licence file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/plog/usage b/ports/plog/usage index 6c232afda6..bfba94d5e2 100644 --- a/ports/plog/usage +++ b/ports/plog/usage @@ -1,4 +1,6 @@ The package plog is header only and can be used from CMake via: - find_path(PLOG_INCLUDE_DIRS "plog/Log.h") - target_include_directories(main PRIVATE ${PLOG_INCLUDE_DIRS}) +Modern CMake: + find_package(plog CONFIG REQUIRED) + target_link_libraries(main PRIVATE plog::plog) + diff --git a/ports/plog/vcpkg.json b/ports/plog/vcpkg.json index 4e1d894208..7f04443608 100644 --- a/ports/plog/vcpkg.json +++ b/ports/plog/vcpkg.json @@ -1,7 +1,17 @@ { "name": "plog", - "version": "1.1.6", + "version": "1.1.8", "description": "Portable, simple and extensible C++ logging library.", "homepage": "https://github.com/SergiusTheBest/plog", - "license": "MPL-2.0" + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 21a629c44b..c315072c5e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5505,7 +5505,7 @@ "port-version": 6 }, "plog": { - "baseline": "1.1.6", + "baseline": "1.1.8", "port-version": 0 }, "plplot": { diff --git a/versions/p-/plog.json b/versions/p-/plog.json index af0042a7a3..fae370de9c 100644 --- a/versions/p-/plog.json +++ b/versions/p-/plog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b16507d8b9cbf419b2923d55de7ddfdf013f0267", + "version": "1.1.8", + "port-version": 0 + }, { "git-tree": "aaca8cb03c90bca09c7bf83b393521dce2719686", "version": "1.1.6",