From: ibs <ibs@opencascade.com>
Date: Mon, 31 Mar 2014 13:38:40 +0000 (+0400)
Subject: 0024629: Possibility to install binaries in vc*/bin(d), vc*/lib(d) directories
X-Git-Tag: V6_7_1~1
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=61308830731573ccc46d759ad536787c6d0493c8;p=occt-wok.git

0024629: Possibility to install binaries in vc*/bin(d), vc*/lib(d) directories

the paths of toolkits have been changed and now contain bitness, compiler version and build type. e.g., /win32/vc8/bind, /win64/vc10/lib
---

diff --git a/src/WOKTclLib/osutils.tcl b/src/WOKTclLib/osutils.tcl
index 152c9c1..5e500fb 100755
--- a/src/WOKTclLib/osutils.tcl
+++ b/src/WOKTclLib/osutils.tcl
@@ -2273,20 +2273,20 @@ proc osutils:cmktk { theOutDir theToolKit {theIsExec false} theModule} {
     lappend aFileBuff ""
     lappend aFileBuff " set_property(TARGET ${theToolKit} PROPERTY FOLDER ${theModule})"
     lappend aFileBuff ""
-    lappend aFileBuff " install( TARGETS ${theToolKit} DESTINATION \"\$\{INSTALL_DIR\}/bin\" )"
+    lappend aFileBuff " install( TARGETS ${theToolKit} DESTINATION \"\$\{INSTALL_DIR\}/\$\{OS_WITH_BIT\}/\$\{COMPILER\}/bin\$\{BUILD_SUFFIX\}\" )"
   } else {
     lappend aFileBuff " add_library( ${theToolKit} SHARED \$\{${theToolKit}_USED_SRCFILES\} )"
     lappend aFileBuff ""
     lappend aFileBuff " set_property(TARGET ${theToolKit} PROPERTY FOLDER ${theModule})"
     lappend aFileBuff ""
     lappend aFileBuff " install( TARGETS ${theToolKit}
-                                 RUNTIME DESTINATION \"\$\{INSTALL_DIR\}/bin\"
-                                 ARCHIVE DESTINATION \"\$\{INSTALL_DIR\}/lib\"
-                                 LIBRARY DESTINATION \"\$\{INSTALL_DIR\}/lib\")"
+                                 RUNTIME DESTINATION \"\$\{INSTALL_DIR\}/\$\{OS_WITH_BIT\}/\$\{COMPILER\}/bin\$\{BUILD_SUFFIX\}\"
+                                 ARCHIVE DESTINATION \"\$\{INSTALL_DIR\}/\$\{OS_WITH_BIT\}/\$\{COMPILER\}/lib\$\{BUILD_SUFFIX\}\"
+                                 LIBRARY DESTINATION \"\$\{INSTALL_DIR\}/\$\{OS_WITH_BIT\}/\$\{COMPILER\}/lib\$\{BUILD_SUFFIX\}\")"
     lappend aFileBuff ""
     lappend aFileBuff " if (MSVC)"
     lappend aFileBuff "  install( FILES  \$\{CMAKE_BINARY_DIR\}/out/bin/Debug/${theToolKit}.pdb CONFIGURATIONS Debug
-                                  DESTINATION \"\$\{INSTALL_DIR\}/bin\")"
+                                  DESTINATION \"\$\{INSTALL_DIR\}/\$\{OS_WITH_BIT\}/\$\{COMPILER\}/bin\$\{BUILD_SUFFIX\}\")"
     lappend aFileBuff " endif()"
     lappend aFileBuff ""
   }