fix bugged IMPORTED_LOCATION

Author: jpfeuffer

boost-install-dirs.jam

@@ -58,6 +58,13 @@ rule stage-libdir
     }
 }
 
+# stage-bindir
+
+rule stage-bindir
+{
+    return [ stage-libdir ] ;
+}
+
 # stage-includedir
 
 rule stage-includedir

boost-install.jam

@@ -488,7 +488,7 @@ rule generate-cmake-variant- ( target : sources * : properties * )
     print.text
 
         "set_target_properties($(target) PROPERTIES"
-        "  IMPORTED_LOCATION_$(variant:U) \"${_BOOST_LIBDIR}/$(dll-name)\""
+        "  IMPORTED_LOCATION_$(variant:U) \"${_BOOST_BINDIR}/$(dll-name)\""
         "  )"
         ""
         : true ;
@@ -770,6 +770,10 @@ rule make-cmake-config ( target : sources * : properties * )
     libdir = [ path.relative-to $(cmakedir) $(libdir) ] ;
     .info "  libdir=" $(libdir) ;
 
+    local bindir = [ stage.get-dir bindir : $(ps) : Boost ] ;
+    bindir = [ path.relative-to $(cmakedir) $(bindir) ] ;
+    .info "  bindir=" $(bindir) ;
+
     local lname = [ MATCH boost_(.*) : $(name) ] ;
     .info "  lname=" $(lname) ;
 
@@ -837,6 +841,7 @@ rule make-cmake-config ( target : sources * : properties * )
     else
     {
         get-dir "_BOOST_LIBDIR" : $(libdir) ;
+        get-dir "_BOOST_BINDIR" : $(bindir) ;
 
         print.text
 
@@ -869,6 +874,7 @@ rule make-cmake-config ( target : sources * : properties * )
             "endforeach()"
             ""
             "unset(_BOOST_SINGLE_VARIANT)"
+            "unset(_BOOST_BINDIR)"
             "unset(_BOOST_LIBDIR)"
             "unset(_BOOST_INCLUDEDIR)"
             "unset(_BOOST_CMAKEDIR)"
@@ -1060,8 +1066,9 @@ rule install-or-stage-cmake-config ( name * : install-or-stage )
         if $(install-or-stage) = stage
         {
             local libdir = [ boost-install-dirs.stage-libdir ] ;
+            local bindir = [ boost-install-dirs.stage-bindir ] ;
             local includedir = [ boost-install-dirs.stage-includedir ] ;
-            reqs = <install-libdir>$(libdir) <install-includedir>$(includedir) ;
+            reqs = <install-libdir>$(libdir) <install-bindir>$(bindir) <install-includedir>$(includedir) ;
         }
         else
         {