diff options
| author | Long Nguyen <nguyen.long.908132@gmail.com> | 2021-02-04 02:40:02 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 11:40:02 -0800 |
| commit | e2fc73ec5c6d6e30dd6ea56312c49d7aa3fdb744 (patch) | |
| tree | 64ec1a23296c2767bedd99c266d5d5b1e02927bb | |
| parent | 36f69420544d72c4a8ee0c72870315ba9ce01ef1 (diff) | |
| download | vcpkg-e2fc73ec5c6d6e30dd6ea56312c49d7aa3fdb744.tar.gz vcpkg-e2fc73ec5c6d6e30dd6ea56312c49d7aa3fdb744.zip | |
[date] Fix vcpkg_fixup_cmake_targets for mingw (#15994)
* [date] Fix vcpkg_fixup_cmake_targets for mingw
* [vcpkg baseline] Update date port-version
* [date] Tweak Windows detection
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
* [vcpkg baseline] Update date port-version again
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
| -rw-r--r-- | ports/date/CONTROL | 2 | ||||
| -rw-r--r-- | ports/date/portfile.cmake | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/d-/date.json | 5 |
4 files changed, 8 insertions, 3 deletions
diff --git a/ports/date/CONTROL b/ports/date/CONTROL index b44b024cd..0489b34d3 100644 --- a/ports/date/CONTROL +++ b/ports/date/CONTROL @@ -1,6 +1,6 @@ Source: date Version: 3.0.0 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/HowardHinnant/date Description: A date and time library based on the C++17 <chrono> header diff --git a/ports/date/portfile.cmake b/ports/date/portfile.cmake index 4dd5a40eb..215f1ef2a 100644 --- a/ports/date/portfile.cmake +++ b/ports/date/portfile.cmake @@ -31,7 +31,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_fixup_cmake_targets(CONFIG_PATH CMake TARGET_PATH share/date) else() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/date TARGET_PATH share/date) diff --git a/versions/baseline.json b/versions/baseline.json index 6e093f264..e25334954 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1538,7 +1538,7 @@ }, "date": { "baseline": "3.0.0", - "port-version": 1 + "port-version": 2 }, "dav1d": { "baseline": "0.8.1", diff --git a/versions/d-/date.json b/versions/d-/date.json index 4f4350366..f739f8dbc 100644 --- a/versions/d-/date.json +++ b/versions/d-/date.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "6223ca4908ce9896c0d17ac21dac600e7f4d54e1", + "version-string": "3.0.0", + "port-version": 2 + }, + { "git-tree": "42976b85736114e38204b7d8cd5ea5e74a73c7cd", "version-string": "3.0.0", "port-version": 1 |