]> OCCT Git - occt-wok.git/commitdiff
0023784: Fixed project file generation
authordbv <dbv@opencascade.com>
Thu, 21 Feb 2013 11:43:12 +0000 (14:43 +0300)
committerdbv <dbv@opencascade.com>
Fri, 22 Feb 2013 07:17:09 +0000 (11:17 +0400)
src/WOKTclLib/osutils.tcl

index c5a0e1884dc8825f0bc559bba30bc508d0367819..8e382c91355411a273738338b6777d766120945a 100755 (executable)
@@ -2139,13 +2139,23 @@ proc osutils:cbpx { theOutDir theToolKit } {
         if {[wokparam -t %$element] == 0} {
           continue
         }
+        set isFrameworkNext 0
         foreach fl [split [wokparam -v %$element] \{\ \}] {
           if {[string first "-libpath" $fl] != "-1"} {
             # this is library search path, not the library name
             continue
+          } elseif {[string first "-framework" $fl] != "-1"} {
+            set isFrameworkNext 1
+            continue
           }
+
           set felem [file tail $fl]
-          if {[lsearch $aUsedToolKits $felem] == "-1"} {
+          if {$isFrameworkNext == 1} {
+            if {[lsearch $aFrameworks $felem] == "-1"} {
+              lappend aFrameworks "${felem}"
+            }
+            set isFrameworkNext 0
+          } elseif {[lsearch $aUsedToolKits $felem] == "-1"} {
             if {$felem != "\{\}" & $felem != "lib"} {
               if {[lsearch -nocase [osutils:optinal_libs] $felem] == -1} {
                 lappend aUsedToolKits [string trimleft "${felem}" "-l"]