diff options
| author | chausner <15180557+chausner@users.noreply.github.com> | 2021-09-28 04:50:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 19:50:26 -0700 |
| commit | 50c0b41fe49f9239fda2b6d8bb5ca322b571c189 (patch) | |
| tree | cd8b3f9d01a154d2bea18b25d3d9d7d9304169dd | |
| parent | 5c6bad28e05b208f9c892d97918e4a27b72b4ca9 (diff) | |
| download | vcpkg-50c0b41fe49f9239fda2b6d8bb5ca322b571c189.tar.gz vcpkg-50c0b41fe49f9239fda2b6d8bb5ca322b571c189.zip | |
[clue] Update to 1.0.0 (#20329)
* Update clue to 1.0.0
* Update CI baseline
* Address PR feedback
* Update git-tree hash
* Update ports/clue/portfile.cmake
* Small changes for copyright
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
| -rw-r--r-- | ports/clue/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ports/clue/portfile.cmake | 18 | ||||
| -rw-r--r-- | ports/clue/vcpkg.json | 9 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/c-/clue.json | 5 |
5 files changed, 25 insertions, 17 deletions
diff --git a/ports/clue/CMakeLists.txt b/ports/clue/CMakeLists.txt index 451d414b8..da8afe69f 100644 --- a/ports/clue/CMakeLists.txt +++ b/ports/clue/CMakeLists.txt @@ -6,12 +6,12 @@ option(CLUE_BUILD_TEST "Build tests for clue" OFF) option(CLUE_BUILD_EXAMPLE "Build examples" OFF) include(GNUInstallDirs) -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/clue.hpp") +include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/clue.hpp") if(CLUE_BUILD_TEST) file(GLOB TEST_SOURCES "tests/*.cpp") add_executable(test_clue ${TEST_SOURCES}) - target_include_directories(test_clue PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/tests) + target_include_directories(test_clue PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/tests") install(TARGETS test_clue RUNTIME DESTINATION tools) endif() @@ -21,5 +21,5 @@ if(CLUE_BUILD_EXAMPLE) install(FILES ${EXAMPLES} DESTINATION examples) endif() -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/clue.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/clue.hpp" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") # end of file
\ No newline at end of file diff --git a/ports/clue/portfile.cmake b/ports/clue/portfile.cmake index 3b9715f9e..3be585eb6 100644 --- a/ports/clue/portfile.cmake +++ b/ports/clue/portfile.cmake @@ -1,28 +1,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/clue - REF v1.0.0-alpha.7 - SHA512 4f0d1115dcf16412239e1ac158be210403f93596b76c91100ae81be3d4f4cb04dda525101850356a7195b219c826305a82cab7a96b1bc1e2cefaa7860a853e73 + REF v1.0.0 + SHA512 A142EDD57753DA36687803332E81BD9D4413203F69F0055466219437C3385C593384DA2A3C6BC67B39EC7ED0C36854354F34C2AA2D4CE4F1D2B912546F4F46B2 HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES test CLUE_BUILD_TEST ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/clue/vcpkg.json b/ports/clue/vcpkg.json index 105741b09..bed4f2fe6 100644 --- a/ports/clue/vcpkg.json +++ b/ports/clue/vcpkg.json @@ -1,9 +1,14 @@ { "name": "clue", - "version-string": "1.0.0-alpha.7", - "port-version": 1, + "version": "1.0.0", "description": "clue is a C++03 header-only library to log messages with a severity and optional module identifier.", "homepage": "https://github.com/martinmoene/clue", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "features": { "test": { "description": "Build test" diff --git a/versions/baseline.json b/versions/baseline.json index 719b5257f..5936fbfa0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1397,8 +1397,8 @@ "port-version": 1 }, "clue": { - "baseline": "1.0.0-alpha.7", - "port-version": 1 + "baseline": "1.0.0", + "port-version": 0 }, "cmark": { "baseline": "0.30.1", diff --git a/versions/c-/clue.json b/versions/c-/clue.json index def781117..bb871c320 100644 --- a/versions/c-/clue.json +++ b/versions/c-/clue.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "b486e21df033265619432ec3718ae4db462fb76b", + "version": "1.0.0", + "port-version": 0 + }, + { "git-tree": "b58662a5b92d34be097810c33d6ec24400ae0b26", "version-string": "1.0.0-alpha.7", "port-version": 1 |