0023769: Disable Xw and ImageUtility packages building on Mac OS X, when Cocoa used

Exclude X11 libraries in CMake scripts on MacOS X by default
Removed package ImageUtility

diff --git a/src/WOKBuilderDef/CSF_MAC.edl b/src/WOKBuilderDef/CSF_MAC.edl
index 375b0ab3ce4c303e622f7519b741aa4eeaa534aa..d7c9db379dde155e0972c6e1015fa05417952c9a 100644 (file)
--- a/src/WOKBuilderDef/CSF_MAC.edl
+++ b/src/WOKBuilderDef/CSF_MAC.edl
@@ -62,27 +62,31 @@
   @set %CSF_Appkit          = "-framework Appkit ";
   @set %CSF_IOKit           = "-framework IOKit ";
 
-  @set %CSF_X11_INCLUDE    = "-I/usr/X11R6/include ";
-  @set %CSF_OPENGL_INCLUDE = "-I/usr/X11R6/include ";
-
-  @set %X11_LIB = "/usr/X11R6/lib";
-
-  @string %CSF_XwLibs     = "-L" %X11_LIB " -lX11 -lXext -lXmu -lXi ";
   @if (%MACOSX_USE_GLX == "true") then
+    @set %CSF_X11_INCLUDE    = "-I/usr/X11R6/include ";
+    @set %CSF_OPENGL_INCLUDE = "-I/usr/X11R6/include ";
+
+    @set %X11_LIB = "/usr/X11R6/lib";
+    @string %CSF_XwLibs     = "-L" %X11_LIB " -lX11 -lXext -lXmu -lXi ";
     @string %CSF_OpenGlLibs = %CSF_XwLibs " -lGLU -lGL ";
+    @string %CSF_MotifLibs  = "-L" %X11_LIB " -lX11 ";
   @else
     @string %CSF_OpenGlLibs = " -framework OpenGL";
   @endif;
-  @string %CSF_MotifLibs  = "-L" %X11_LIB " -lX11 ";
 
   -- Tcl/Tk configuration
+  @string %CSF_TclTkLibs = "";
+  @if (%MACOSX_USE_GLX == "true") then
+    @string %CSF_TclTkLibs = "-L" %X11_LIB " -lX11 ";
+  @endif;
+
   @if (%CSF_TCL_HOME != "") then
     @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include ";
     @string %CSF_TclLibs   = "-L" %CSF_TCL_HOME "/lib -ltcl8.5 ";
-    @string %CSF_TclTkLibs = "-L" %X11_LIB " -lX11 -L" %CSF_TCL_HOME "/lib -ltk8.5 ";
+    @string %CSF_TclTkLibs += "-L" %CSF_TCL_HOME "/lib -ltk8.5 ";
   @else
     @string %CSF_TclLibs   = " -ltcl8.5 ";
-    @string %CSF_TclTkLibs = "-L" %X11_LIB " -lX11 -ltk8.5 ";
+    @string %CSF_TclTkLibs += "-ltk8.5 ";
   @endif;
 
 @endif;

diff --git a/src/WOKTclLib/osutils.tcl b/src/WOKTclLib/osutils.tcl
index 0b29e98c696998840c7bf42d32d480ff97a6b33a..c5a0e1884dc8825f0bc559bba30bc508d0367819 100755 (executable)
--- a/src/WOKTclLib/osutils.tcl
+++ b/src/WOKTclLib/osutils.tcl
@@ -241,7 +241,7 @@ proc osutils:juststation {goaway listloc} {
 }
 
 proc osutils:justwnt { listloc } {
-  set goaway [list Xdps Xw ImageUtility WOKUnix]
+  set goaway [list Xdps Xw WOKUnix]
   return [osutils:juststation $goaway $listloc]
 }
 
@@ -249,7 +249,11 @@ proc osutils:justwnt { listloc } {
 ;# remove from listloc OpenCascade units indesirables on Unix
 ;#
 proc osutils:justunix { listloc } {
-  set goaway [list WNT WOKNT]
+  if { "$::tcl_platform(os)" == "Darwin" && "$::MACOSX_USE_GLX" != "true" } {
+    set goaway [list Xw WNT WOKNT]
+  } else {
+    set goaway [list WNT WOKNT]
+  }
   return [osutils:juststation $goaway $listloc]
 }
 
@@ -1991,10 +1995,12 @@ proc osutils:cmktk { theOutDir theToolKit {theIsExec false} theModule} {
       lappend aFileBuff "    list( APPEND ${theToolKit}_USED_LIBS ${anUsedMacLib} )"
       lappend aFileBuff "  endif()"
     } elseif { $anUsedMacLib == "X11" } {
-      lappend aFileBuff "  find_package(X11 COMPONENTS X11 Xext Xmu Xi)"
-      lappend aFileBuff "  list( APPEND ${theToolKit}_USED_LIBS \$\{X11_LIBRARIES\} )"
-      lappend aFileBuff "  list( APPEND ${theToolKit}_USED_LIBS \$\{X11_Xi_LIB\} )"
-      lappend aFileBuff "  list( APPEND ${theToolKit}_USED_LIBS \$\{X11_Xmu_LIB\} )"
+      lappend aFileBuff "  if(3RDPARTY_USE_GLX)"
+      lappend aFileBuff "    find_package(X11 COMPONENTS X11 Xext Xmu Xi)"
+      lappend aFileBuff "    list( APPEND ${theToolKit}_USED_LIBS \$\{X11_LIBRARIES\} )"
+      lappend aFileBuff "    list( APPEND ${theToolKit}_USED_LIBS \$\{X11_Xi_LIB\} )"
+      lappend aFileBuff "    list( APPEND ${theToolKit}_USED_LIBS \$\{X11_Xmu_LIB\} )"
+      lappend aFileBuff "  endif()"
     } elseif { $anUsedMacLib == "Appkit" } {
       lappend aFileBuff "  find_library(FRAMEWORKS_APPKIT NAMES Appkit)"
       lappend aFileBuff "  list( APPEND ${theToolKit}_USED_LIBS \$\{FRAMEWORKS_APPKIT\} )"
@@ -2003,7 +2009,12 @@ proc osutils:cmktk { theOutDir theToolKit {theIsExec false} theModule} {
       lappend aFileBuff "  list( APPEND ${theToolKit}_USED_LIBS \$\{FRAMEWORKS_IOKIT\} )"
     } elseif { $anUsedMacLib == "OpenGL" } {
       lappend aFileBuff "  find_library(FRAMEWORKS_OPENGL NAMES OpenGL)"
-      lappend aFileBuff "  list( APPEND ${theToolKit}_USED_LIBS \$\{FRAMEWORKS_OPENGL\} )"
+      lappend aFileBuff "  if(3RDPARTY_USE_GLX)"
+      lappend aFileBuff "    list( APPEND ${theToolKit}_USED_LIBS GL )"
+      lappend aFileBuff "    list( APPEND ${theToolKit}_USED_LIBS GLU )"
+      lappend aFileBuff "  else()"
+      lappend aFileBuff "    list( APPEND ${theToolKit}_USED_LIBS \$\{FRAMEWORKS_OPENGL\} )"
+      lappend aFileBuff "  endif()"
     } elseif { $anUsedMacLib != "" } {
       lappend aFileBuff "  list( APPEND ${theToolKit}_USED_LIBS ${anUsedMacLib} )"
     }

diff --git a/src/WOKsite/wok_deps.tcl b/src/WOKsite/wok_deps.tcl
index b2515fa12b0d911effabc7e9769ec7998b5694e1..388f8160529733ef57cbfd0ddbb94691f7f749db 100644 (file)
--- a/src/WOKsite/wok_deps.tcl
+++ b/src/WOKsite/wok_deps.tcl
@@ -665,7 +665,7 @@ proc wokdep:SearchX11 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
   upvar $theErrBin64 anErrBin64
 
   set isFound "true"
-  if { "$::tcl_platform(platform)" == "windows" } {
+  if { "$::tcl_platform(platform)" == "windows" || ( "$::tcl_platform(os)" == "Darwin" && "$::MACOSX_USE_GLX" != "true" ) } {
     return "$isFound"
   }