[boost-test] Move _exec_monitor libs to manual-link. Fixes #2444.

microsoft · Jan 4, 2018 · b899067 · b899067
1 parent 3bebb10
commit b899067
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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"
 }