allow adding dll-path to usage requirements of searched libraries (#389)

bfgroup · May 23, 2024 · 9242cd5 · 9242cd5
1 parent 5cde9e8
commit 9242cd5
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 3 deletions.
diff --git a/src/build/ac.jam b/src/build/ac.jam
@@ -182,6 +182,11 @@ class ac-library : basic-target
         self.target = $(target) ;
     }
 
+    rule add-usage-requirements ( properties * )
+    {
+        self.extra-ureqs += $(properties) ;
+    }
+
     rule check-not-configured ( )
     {
         if $(self.include-path) || $(self.library-path) || $(self.library-name) || $(self.target)
@@ -194,7 +199,8 @@ class ac-library : basic-target
     {
         if $(self.target)
         {
-            return [ $(self.target).generate $(property-set) ] ;
+            local result = [ $(self.target).generate $(property-set) ] ;
+            return [ $(result[1]).add-raw $(self.extra-ureqs) ] $(result[2-]) ;
         }
         else
         {
@@ -252,7 +258,8 @@ class ac-library : basic-target
                     local library = [ ac.construct-library $(lookup[2]) :
                         [ $(property-set).refine [ property-set.create $(lookup[3]) ] ] : $(library-path) ] ;
                     configure.log-library-search-result $(name) : "yes (cached)" $(min) ;
-                    return [ $(library[1]).add-raw <include>$(includes) ] $(library[2-]) ;
+                    return [ $(library[1]).add-raw <include>$(includes)
+                        $(self.extra-ureqs) ] $(library[2-]) ;
                 }
             }
             else
@@ -269,7 +276,8 @@ class ac-library : basic-target
                     library = [ ac.construct-library $(library[1]) :
                         [ $(property-set).refine [ property-set.create $(library[2]) ] ]  : $(library-path) ] ;
                     configure.log-library-search-result $(name) : "yes" $(min) ;
-                    return [ $(library[1]).add-raw <include>$(includes) ] $(library[2-]) ;
+                    return [ $(library[1]).add-raw <include>$(includes)
+                        $(self.extra-ureqs) ] $(library[2-]) ;
                 }
                 else
                 {

diff --git a/src/tools/bzip2.jam b/src/tools/bzip2.jam
@@ -52,6 +52,9 @@ if --debug-configuration in [ modules.peek : ARGV ]
 #       Overrides the default library name.
 #   <include>
 #       The directory containing the bzip headers.
+#   <dll-path>
+#       Extra directories to add to library search paths of consumers during
+#       runtime (multiple instances are allowed).
 #
 # If none of these options is specified, then the environmental
 # variables BZIP2_LIBRARY_PATH, BZIP2_NAME, and BZIP2_INCLUDE will
@@ -117,6 +120,7 @@ rule init (
     local include-path = [ feature.get-values <include> : $(options) ] ;
     local source-path = [ feature.get-values <source> : $(options) ] ;
     local library-name = [ feature.get-values <name> : $(options) ] ;
+    local dll-paths = [ property.select <dll-path> : $(options) ] ;
     local tag = [ feature.get-values <tag> : $(options) ] ;
     local build-name = [ feature.get-values <build-name> : $(options) ] ;
 
@@ -239,6 +243,7 @@ rule init (
             $(include-path) : $(library-path) : $(library-name) ] ;
         $(mt).set-header $(header) ;
         $(mt).set-default-names $(names) ;
+        $(mt).add-usage-requirements $(dll-paths) ;
         targets.main-target-alternative $(mt) ;
     }
     .configured.$(condition) = true ;

diff --git a/src/tools/libjpeg.jam b/src/tools/libjpeg.jam
@@ -58,6 +58,9 @@ if --debug-configuration in [ modules.peek : ARGV ]
 #       Overrides the default library name.
 #   <include>
 #       The directory containing the libjpeg headers.
+#   <dll-path>
+#       Extra directories to add to library search paths of consumers during
+#       runtime (multiple instances are allowed).
 #
 # If none of these options is specified, then the environmental
 # variables LIBJPEG_LIBRARY_PATH, LIBJPEG_NAME, and LIBJPEG_INCLUDE will
@@ -123,6 +126,7 @@ rule init (
     local include-path = [ feature.get-values <include> : $(options) ] ;
     local source-path = [ feature.get-values <source> : $(options) ] ;
     local library-name = [ feature.get-values <name> : $(options) ] ;
+    local dll-paths = [ property.select <dll-path> : $(options) ] ;
     local tag = [ feature.get-values <tag> : $(options) ] ;
     local build-name = [ feature.get-values <build-name> : $(options) ] ;
 
@@ -208,6 +212,7 @@ rule init (
         local mt = [ new ac-library libjpeg : $(.project) : $(condition) ] ;
         $(mt).set-header $(header) ;
         $(mt).set-default-names $(names) ;
+        $(mt).add-usage-requirements $(dll-paths) ;
         if $(target)
         {
             $(mt).set-target $(target) ;

diff --git a/src/tools/libpng.jam b/src/tools/libpng.jam
@@ -53,6 +53,9 @@ if --debug-configuration in [ modules.peek : ARGV ]
 #       Overrides the default library name.
 #   <include>
 #       The directory containing the libpng headers.
+#   <dll-path>
+#       Extra directories to add to library search paths of consumers during
+#       runtime (multiple instances are allowed).
 #
 # If none of these options is specified, then the environmental
 # variables LIBPNG_LIBRARY_PATH, LIBPNG_NAME, and LIBPNG_INCLUDE will
@@ -118,6 +121,7 @@ rule init (
     local include-path = [ feature.get-values <include> : $(options) ] ;
     local source-path = [ feature.get-values <source> : $(options) ] ;
     local library-name = [ feature.get-values <name> : $(options) ] ;
+    local dll-paths = [ property.select <dll-path> : $(options) ] ;
     local tag = [ feature.get-values <tag> : $(options) ] ;
     local build-name = [ feature.get-values <build-name> : $(options) ] ;
 
@@ -204,6 +208,7 @@ rule init (
         local mt = [ new ac-library libpng : $(.project) : $(condition) ] ;
         $(mt).set-header $(header) ;
         $(mt).set-default-names $(names) ;
+        $(mt).add-usage-requirements $(dll-paths) ;
         if $(target)
         {
             $(mt).set-target $(target) ;

diff --git a/src/tools/libtiff.jam b/src/tools/libtiff.jam
@@ -52,6 +52,9 @@ if --debug-configuration in [ modules.peek : ARGV ]
 #       Overrides the default library name.
 #   <include>
 #       The directory containing the libtiff headers.
+#   <dll-path>
+#       Extra directories to add to library search paths of consumers during
+#       runtime (multiple instances are allowed).
 #
 # If none of these options is specified, then the environmental
 # variables LIBTIFF_LIBRARY_PATH, LIBTIFF_NAME, and LIBTIFF_INCLUDE will
@@ -117,6 +120,7 @@ rule init (
     local include-path = [ feature.get-values <include> : $(options) ] ;
     local source-path = [ feature.get-values <source> : $(options) ] ;
     local library-name = [ feature.get-values <name> : $(options) ] ;
+    local dll-paths = [ property.select <dll-path> : $(options) ] ;
     local tag = [ feature.get-values <tag> : $(options) ] ;
     local build-name = [ feature.get-values <build-name> : $(options) ] ;
 
@@ -202,6 +206,7 @@ rule init (
         local mt = [ new ac-library libtiff : $(.project) : $(condition) ] ;
         $(mt).set-header $(header) ;
         $(mt).set-default-names $(names) ;
+        $(mt).add-usage-requirements $(dll-paths) ;
         if $(target)
         {
             $(mt).set-target $(target) ;

diff --git a/src/tools/lzma.jam b/src/tools/lzma.jam
@@ -44,6 +44,9 @@ if --debug-configuration in [ modules.peek : ARGV ]
 #       Overrides the default library name.
 #   <include>
 #       The directory containing the lzma headers.
+#   <dll-path>
+#       Extra directories to add to library search paths of consumers during
+#       runtime (multiple instances are allowed).
 #
 # If none of these options is specified, then the environmental
 # variables LZMA_LIBRARY_PATH, LZMA_NAME, and LZMA_INCLUDE will
@@ -89,6 +92,7 @@ rule init (
     local library-path = [ feature.get-values <search> : $(options) ] ;
     local include-path = [ feature.get-values <include> : $(options) ] ;
     local library-name = [ feature.get-values <name> : $(options) ] ;
+    local dll-paths = [ property.select <dll-path> : $(options) ] ;
 
     if ! $(options)
     {
@@ -128,6 +132,7 @@ rule init (
             $(include-path) : $(library-path) : $(library-name) ] ;
         $(mt).set-header $(header) ;
         $(mt).set-default-names $(names) ;
+        $(mt).add-usage-requirements $(dll-paths) ;
         targets.main-target-alternative $(mt) ;
     }
     .configured.$(condition) = true ;

diff --git a/src/tools/openssl.jam b/src/tools/openssl.jam
@@ -49,6 +49,9 @@ if --debug-configuration in [ modules.peek : ARGV ]
 #       Overrides the default name of crypto library.
 #   <include>
 #       The directory containing the openssl headers.
+#   <dll-path>
+#       Extra directories to add to library search paths of consumers during
+#       runtime (multiple instances are allowed).
 #
 # If none of these options is specified, then the environmental
 # variables OPENSSL_LIBRARY_PATH, OPENSSL_NAME, and OPENSSL_INCLUDE will
@@ -90,6 +93,7 @@ rule init (
     local include-path = [ feature.get-values <include> : $(options) ] ;
     local ssl-name = [ feature.get-values <ssl-name> : $(options) ] ;
     local crypto-name = [ feature.get-values <crypto-name> : $(options) ] ;
+    local dll-paths = [ property.select <dll-path> : $(options) ] ;
 
     if ! $(library-path) && ! $(include-path) && ! $(source-path) && ! $(ssl-name) && ! $(crypto-name)
     {
@@ -132,11 +136,13 @@ rule init (
             $(include-path) : $(library-path) ] ;
         $(ssl_lib).set-header openssl/ssl.h ;
         $(ssl_lib).set-default-names $(ssl-name) ;
+        $(ssl_lib).add-usage-requirements $(dll-paths) ;
 
         local crypto_lib = [ new ac-library crypto : $(.project) : $(condition) :
             $(include-path) : $(library-path) ] ;
         $(crypto_lib).set-header openssl/crypto.h ;
         $(crypto_lib).set-default-names $(crypto-name) ;
+        $(crypto_lib).add-usage-requirements $(dll-paths) ;
 
         targets.main-target-alternative $(ssl_lib) ;
         targets.main-target-alternative $(crypto_lib) ;

diff --git a/src/tools/zlib.jam b/src/tools/zlib.jam
@@ -51,6 +51,9 @@ if --debug-configuration in [ modules.peek : ARGV ]
 #       Overrides the default library name.
 #   <include>
 #       The directory containing the zlib headers.
+#   <dll-path>
+#       Extra directories to add to library search paths of consumers during
+#       runtime (multiple instances are allowed).
 #
 # If none of these options is specified, then the environmental
 # variables ZLIB_LIBRARY_PATH, ZLIB_NAME, and ZLIB_INCLUDE will
@@ -116,6 +119,7 @@ rule init (
     local include-path = [ feature.get-values <include> : $(options) ] ;
     local source-path = [ feature.get-values <source> : $(options) ] ;
     local library-name = [ feature.get-values <name> : $(options) ] ;
+    local dll-paths = [ property.select <dll-path> : $(options) ] ;
     local tag = [ feature.get-values <tag> : $(options) ] ;
     local build-name = [ feature.get-values <build-name> : $(options) ] ;
 
@@ -208,6 +212,7 @@ rule init (
         local mt = [ new ac-library zlib : $(.project) : $(condition) ] ;
         $(mt).set-header $(header) ;
         $(mt).set-default-names $(names) ;
+        $(mt).add-usage-requirements $(dll-paths) ;
         if $(target)
         {
             $(mt).set-target $(target) ;

diff --git a/src/tools/zstd.jam b/src/tools/zstd.jam
@@ -60,6 +60,7 @@ rule init (
     local library-path = [ feature.get-values <search> : $(options) ] ;
     local include-path = [ feature.get-values <include> : $(options) ] ;
     local library-name = [ feature.get-values <name> : $(options) ] ;
+    local dll-paths = [ property.select <dll-path> : $(options) ] ;
 
     condition = [ property-set.create $(requirements) ] ;
     condition = [ property-set.create [ $(condition).base ] ] ;
@@ -94,6 +95,7 @@ rule init (
             $(include-path) : $(library-path) : $(library-name) ] ;
         $(mt).set-header $(header) ;
         $(mt).set-default-names $(names) ;
+        $(mt).add-usage-requirements $(dll-paths) ;
         targets.main-target-alternative $(mt) ;
     }
     .configured.$(condition) = true ;