diff options
| author | Rémy Tassoux <contact@rt2.fr> | 2021-02-19 21:40:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-19 12:40:10 -0800 |
| commit | 8ede7e82b2fe816803c023a201c017cca0d6238a (patch) | |
| tree | d8f40da86b11c3e1268af704f1b079fe5b5e46c1 | |
| parent | 447b9cbe8c2a5a62da19943c48beb798ccae2354 (diff) | |
| download | vcpkg-8ede7e82b2fe816803c023a201c017cca0d6238a.tar.gz vcpkg-8ede7e82b2fe816803c023a201c017cca0d6238a.zip | |
[quill] Uncomment QUILL_FMT_EXTERNAL macro (#16202)
* [quill] Uncomment QUILL_FMT_EXTERNAL macro
As we build using the vcpkg FMT port instead of the one bundled in Quill, this macro needs to be defined.
* [quill] Update version files
* [quill] Use vcpkg_replace_string
* [quill] Update version files
Co-authored-by: Rémy Tassoux <rt2@rasterizedworld.com>
| -rw-r--r-- | ports/quill/CONTROL | 1 | ||||
| -rw-r--r-- | ports/quill/portfile.cmake | 6 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/q-/quill.json | 5 |
4 files changed, 8 insertions, 6 deletions
diff --git a/ports/quill/CONTROL b/ports/quill/CONTROL index 5cc25ff73..7bb9d9ace 100644 --- a/ports/quill/CONTROL +++ b/ports/quill/CONTROL @@ -1,5 +1,6 @@ Source: quill
Version: 1.6.1
+Port-Version: 1
Homepage: https://github.com/odygrd/quill/
Description: C++14 Asynchronous Low Latency Logging Library
Supports: !(arm|uwp|android)
diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index b35661684..28e2da3e5 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -10,10 +10,6 @@ vcpkg_from_github( HEAD_REF master
)
-# remove bundled fmt
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/quill/quill/include/quill/bundled/fmt)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/quill/quill/src/bundled/fmt)
-
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
@@ -22,9 +18,9 @@ vcpkg_configure_cmake( )
vcpkg_install_cmake()
-
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/quill)
+vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h "// #define QUILL_FMT_EXTERNAL" "#define QUILL_FMT_EXTERNAL")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/versions/baseline.json b/versions/baseline.json index 23c88be44..1d0d0c319 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5006,7 +5006,7 @@ }, "quill": { "baseline": "1.6.1", - "port-version": 0 + "port-version": 1 }, "quirc": { "baseline": "1.1", diff --git a/versions/q-/quill.json b/versions/q-/quill.json index b19d26599..3215bf4e4 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "aa542e38f0f2480e495b785840e919d46a1d58d5", + "version-string": "1.6.1", + "port-version": 1 + }, + { "git-tree": "51f728199fde5bc02ecc29588236bb509cc4bb10", "version-string": "1.6.1", "port-version": 0 |