diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-01-03 17:44:55 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-01-03 17:45:15 -0800 |
| commit | b899067edba25c5464a96a5dd2c5cfac5901b785 (patch) | |
| tree | 29380498abe4e4eb4305849cff68ec20730dca8c | |
| parent | 3bebb1074420858b9c703865c518cf09438fa52a (diff) | |
| download | vcpkg-b899067edba25c5464a96a5dd2c5cfac5901b785.tar.gz vcpkg-b899067edba25c5464a96a5dd2c5cfac5901b785.zip | |
[boost-test] Move _exec_monitor libs to manual-link. Fixes #2444.
| -rw-r--r-- | ports/boost-test/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-test/portfile.cmake | 9 | ||||
| -rw-r--r-- | ports/boost-vcpkg-helpers/generate-ports.ps1 | 22 |
3 files changed, 31 insertions, 2 deletions
diff --git a/ports/boost-test/CONTROL b/ports/boost-test/CONTROL index e19d889b1..63b982ee4 100644 --- a/ports/boost-test/CONTROL +++ b/ports/boost-test/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-test
-Version: 1.66.0
+Version: 1.66.0-1
Build-Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-io, boost-iterator, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-range, boost-smart-ptr, boost-static-assert, boost-timer, boost-type-traits, boost-utility, boost-vcpkg-helpers
Description: Boost test module
diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake index fd6606f0e..090542bc7 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -13,3 +13,12 @@ vcpkg_from_github( boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
+
+file(GLOB MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/lib/*_exec_monitor*)
+file(COPY ${MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
+file(GLOB DEBUG_MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*_exec_monitor*)
+file(COPY ${DEBUG_MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
+
+file(REMOVE ${DEBUG_MONITOR_LIBS} ${MONITOR_LIBS})
diff --git a/ports/boost-vcpkg-helpers/generate-ports.ps1 b/ports/boost-vcpkg-helpers/generate-ports.ps1 index 11f670c7a..09dcbca72 100644 --- a/ports/boost-vcpkg-helpers/generate-ports.ps1 +++ b/ports/boost-vcpkg-helpers/generate-ports.ps1 @@ -21,11 +21,17 @@ function Generate() $sanitizedName = $name -replace "_","-"
+ $versionsuffix = ""
+ if ($Name -eq "test")
+ {
+ $versionsuffix = "-1"
+ }
+
mkdir "$scriptsDir/../boost-$sanitizedName" -erroraction SilentlyContinue | out-null
$controlLines = @(
"# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1"
"Source: boost-$sanitizedName"
- "Version: $version"
+ "Version: $version$versionsuffix"
"Build-Depends: $controlDeps"
"Description: Boost $Name module"
)
@@ -143,6 +149,20 @@ function Generate() "endif()"
)
}
+ if ($Name -eq "test")
+ {
+ $portfileLines += @(
+ "file(MAKE_DIRECTORY `${CURRENT_PACKAGES_DIR}/lib/manual-link)"
+ "file(MAKE_DIRECTORY `${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)"
+ ""
+ "file(GLOB MONITOR_LIBS `${CURRENT_PACKAGES_DIR}/lib/*_exec_monitor*)"
+ "file(COPY `${MONITOR_LIBS} DESTINATION `${CURRENT_PACKAGES_DIR}/lib/manual-link)"
+ "file(GLOB DEBUG_MONITOR_LIBS `${CURRENT_PACKAGES_DIR}/debug/lib/*_exec_monitor*)"
+ "file(COPY `${DEBUG_MONITOR_LIBS} DESTINATION `${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)"
+ ""
+ "file(REMOVE `${DEBUG_MONITOR_LIBS} `${MONITOR_LIBS})"
+ )
+ }
$portfileLines | out-file -enc ascii "$scriptsDir/../boost-$sanitizedName/portfile.cmake"
}
|