add dlldir installation directory for shared libraries

boostorg · Jun 18, 2024 · e558b07 · e558b07
1 parent b0a1eb2
commit e558b07
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -585,7 +585,7 @@ jobs:
           cd tools\boost_install\test\${{matrix.lib}}
           mkdir __build__ && cd __build__
           cmake -DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\..\.local -DUSE_BOOST_PACKAGE=1 -DBoost_VERBOSE=ON ${{matrix.copts}} ..
-          PATH %PATH%;%GITHUB_WORKSPACE%\..\.local\lib;%GITHUB_WORKSPACE%\..\boost-root\stage\lib
+          PATH %PATH%;%GITHUB_WORKSPACE%\..\.local\bin;%GITHUB_WORKSPACE%\..\boost-root\stage\bin
           cmake --build . --config Debug && cmake --build . --config Debug --target check
           cmake --build . --config Release && cmake --build . --config Release --target check
           cmake --build . --config MinSizeRel && cmake --build . --config MinSizeRel --target check

diff --git a/boost-install-dirs.jam b/boost-install-dirs.jam
@@ -9,6 +9,7 @@ import path ;
 import stage ;
 
 stage.add-install-dir cmakedir : cmake : libdir ;
+stage.add-install-dir dlldir : "" : libdir ;
 
 # header-subdir
 

diff --git a/boost-install.jam b/boost-install.jam
@@ -1215,6 +1215,30 @@ rule install-subdir ( properties * )
     return <location>(libdir)/$(r:E=) ;
 }
 
+rule os-dlldir ( properties * )
+{
+    local loc = [ property.select <location> : $(properties) ] ;
+    if $(loc)
+    {
+        return $(loc) ;
+    }
+
+    local dll-dir = [ property.select <install-dlldir> : $(properties) ] ;
+    if $(dlldir) || [ option.get dlldir ]
+    {
+        return <location>(dlldir) ;
+    }
+
+    local os = [ property.select <target-os> : $(properties) ] ;
+    os = $(os:G=) ;
+    if $(os:E=x) in windows cygwin
+    {
+        return <location>(bindir) ;
+    }
+
+    return <location>(dlldir) ;
+}
+
 rule boost-install ( libraries * )
 {
     .debug boost-install $(libraries) ;
@@ -1243,16 +1267,9 @@ rule boost-install ( libraries * )
     install install-libraries-static : $(libraries) : <location>(libdir) <install-dependencies>on <install-type>STATIC_LIB ;
     $(p).mark-target-as-explicit install-libraries-static ;
 
-    alias install-libraries-shared : install-libraries-shared- ;
-    alias install-libraries-shared : install-libraries-shared-cygwin : <target-os>cygwin ;
+    install install-libraries-shared : $(libraries) : <install-type>SHARED_LIB <install-type>PDB <install-dependencies>on <install-no-version-symlinks>on <conditional>@boost-install%os-dlldir ;
     $(p).mark-target-as-explicit install-libraries-shared ;
 
-    install install-libraries-shared- : $(libraries) : <location>(libdir) <install-type>SHARED_LIB <install-type>PDB <install-dependencies>on <install-no-version-symlinks>on ;
-    $(p).mark-target-as-explicit install-libraries-shared- ;
-
-    install install-libraries-shared-cygwin : $(libraries) : <location>(bindir) <install-type>SHARED_LIB <install-type>PDB <install-dependencies>on <install-no-version-symlinks>on ;
-    $(p).mark-target-as-explicit install-libraries-shared-cygwin ;
-
     install install-unprefixed-static : $(unprefixed) : <install-type>STATIC_LIB <conditional>@boost-install%install-subdir ;
     $(p).mark-target-as-explicit install-unprefixed-static ;
 
@@ -1304,16 +1321,23 @@ if [ MATCH --prefix=(.*) : [ modules.peek : ARGV ] ]
     option.set datadir : ;
     option.set datarootdir : ;
     option.set cmakedir : ;
+    option.set dlldir : ;
 }
 if [ MATCH --exec-prefix=(.*) : [ modules.peek : ARGV ] ]
 {
     option.set bindir : ;
     option.set libdir : ;
     option.set cmakedir : ;
+    option.set dlldir : ;
 }
 if [ MATCH --libdir-prefix=(.*) : [ modules.peek : ARGV ] ]
 {
     option.set cmakedir : ;
+    option.set dlldir : ;
+}
+if [ MATCH --bindir-prefix=(.*) : [ modules.peek : ARGV ] ]
+{
+    option.set dlldir : ;
 }
 if [ MATCH --dataroot-prefix=(.*) : [ modules.peek : ARGV ] ]
 {