aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Milette <charles.milette@gmail.com>2021-03-18 16:18:51 -0400
committerGitHub <noreply@github.com>2021-03-18 13:18:51 -0700
commit04821b850025a7fecb7604c7221a0d1702dec6d8 (patch)
tree3b94b78df9b48a0aa1eb435ca2e76d2659f73d69
parent1f7d3846180cba2b595738320300cc9b470d9ee2 (diff)
downloadvcpkg-04821b850025a7fecb7604c7221a0d1702dec6d8.tar.gz
vcpkg-04821b850025a7fecb7604c7221a0d1702dec6d8.zip
[detours] support debug builds (#16755)
* [detours] support debug builds * Update baseline * [detours] Update CONTROL * [detours] Update baseline
-rw-r--r--ports/detours/CONTROL4
-rw-r--r--ports/detours/portfile.cmake9
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/d-/detours.json5
4 files changed, 15 insertions, 7 deletions
diff --git a/ports/detours/CONTROL b/ports/detours/CONTROL
index fdf9fa6a4..baf44f69d 100644
--- a/ports/detours/CONTROL
+++ b/ports/detours/CONTROL
@@ -1,3 +1,5 @@
Source: detours
-Version: 4.0.1-1
+Version: 4.0.1
+Port-Version: 2
+Homepage: https://github.com/microsoft/Detours
Description: Detours is a software package for monitoring and instrumenting API calls on Windows. \ No newline at end of file
diff --git a/ports/detours/portfile.cmake b/ports/detours/portfile.cmake
index d1646711f..9b57b1326 100644
--- a/ports/detours/portfile.cmake
+++ b/ports/detours/portfile.cmake
@@ -15,11 +15,12 @@ vcpkg_build_nmake(
PROJECT_SUBPATH "src"
PROJECT_NAME "Makefile"
OPTIONS "PROCESSOR_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}"
- NO_DEBUG
+ OPTIONS_RELEASE "DETOURS_CONFIG=Release"
+ OPTIONS_DEBUG "DETOURS_CONFIG=Debug"
)
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/lib.${VCPKG_TARGET_ARCHITECTURE}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/lib.${VCPKG_TARGET_ARCHITECTURE}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/include DESTINATION ${CURRENT_PACKAGES_DIR}/include RENAME detours)
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib.${VCPKG_TARGET_ARCHITECTURE}Release/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib.${VCPKG_TARGET_ARCHITECTURE}Debug/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/include DESTINATION ${CURRENT_PACKAGES_DIR}/include RENAME detours)
file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/versions/baseline.json b/versions/baseline.json
index bbf5cd5df..0bf60efbc 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1597,8 +1597,8 @@
"port-version": 1
},
"detours": {
- "baseline": "4.0.1-1",
- "port-version": 0
+ "baseline": "4.0.1",
+ "port-version": 2
},
"devicenameresolver": {
"baseline": "2016-06-26-0850d88fa6-1",
diff --git a/versions/d-/detours.json b/versions/d-/detours.json
index 6726eb336..bb2e73f0c 100644
--- a/versions/d-/detours.json
+++ b/versions/d-/detours.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "7400c2c8b63f9576a4b5e4464ad5d8e36d33e1d6",
+ "version-string": "4.0.1",
+ "port-version": 2
+ },
+ {
"git-tree": "ab6a570459cbae07325fbfdd4b51992c9dad3e41",
"version-string": "4.0.1-1",
"port-version": 0