Text archives Help

---

Author: bigler
Date: Wed Nov 28 15:26:11 2007
New Revision: 1882

Modified:
   trunk/CMake/FindX11andGL.cmake
   trunk/CMakeLists.txt
   trunk/Core/CMakeLists.txt
   trunk/Engine/Display/CMakeLists.txt
   trunk/Engine/Factory/CMakeLists.txt
   trunk/Engine/Factory/RegisterKnownComponents.cc
   trunk/SwigInterface/CMakeLists.txt
   trunk/SwigInterface/manta.i
   trunk/UserInterface/CMakeLists.txt
Log:

  Fixes to disable X11 support.

CMake/FindX11andGL.cmake

  Added MANTA_ENABLE_X11 flag.  If X11 isn't found it forces the value
  to OFF.

  Rearranged some of the code based on whether X11 is present or not.

  Moved FindThreads to top level cmake.

CMakeLists.txt

  Moved FindThreads here from FindX11andOpenGL.cmake.

Core/CMakeLists.txt
Engine/Display/CMakeLists.txt
Engine/Factory/CMakeLists.txt
Engine/Factory/RegisterKnownComponents.cc
SwigInterface/CMakeLists.txt
SwigInterface/manta.i
UserInterface/CMakeLists.txt

  Only add code that is X11 specific when MANTA_ENABLE_X11 is true.
  Some places that use classes that are no longer present use
  -DMANTA_ENABLE_X11=1 or -DMANTA_ENABLE_X11=0.


Modified: trunk/CMake/FindX11andGL.cmake
==============================================================================
--- trunk/CMake/FindX11andGL.cmake      (original)
+++ trunk/CMake/FindX11andGL.cmake      Wed Nov 28 15:26:11 2007
@@ -12,10 +12,22 @@
 
###############################################################################
 # X11  X11  X11  X11  X11  X11  X11  X11  X11  X11  X11  X11  X11  X11  X11  
X1
 
+SET(MANTA_ENABLE_X11 ON CACHE BOOL "Is X11 code enabled or disabled")
+
+IF(MANTA_ENABLE_X11)
+  INCLUDE (${CMAKE_ROOT}/Modules/FindX11.cmake)
+  IF (NOT X11_FOUND)
+    SET(MANTA_ENABLE_X11 OFF CACHE BOOL "Is X11 code enabled or disabled" 
FORCE)
+  ENDIF(NOT X11_FOUND)
+ENDIF(MANTA_ENABLE_X11)
+
 IF (APPLE)
-  SET (OPENGL_INCLUDE_DIR               /usr/X11R6/include)
-  SET (OPENGL_gl_LIBRARY                /usr/X11R6/lib/libGL.dylib)
-  SET (OPENGL_glu_LIBRARY               /usr/X11R6/lib/libGLU.dylib)
+  IF(MANTA_ENABLE_X11)
+    # By setting these before we call FindOpenGL, we make sure we get the 
X11 versions
+    SET (OPENGL_INCLUDE_DIR               /usr/X11R6/include)
+    SET (OPENGL_gl_LIBRARY                /usr/X11R6/lib/libGL.dylib)
+    SET (OPENGL_glu_LIBRARY               /usr/X11R6/lib/libGLU.dylib)
+  ENDIF (MANTA_ENABLE_X11)
 
   # Workaround for Leopard ld cyclic re-export defect.
   IF (APPLE_LEOPARD_LD)
@@ -26,19 +38,20 @@
 ENDIF (APPLE)
 
 IF (CYGWIN)
-  SET (OPENGL_INCLUDE_DIR               /usr/X11R6/include)
-  IF (BUILD_SHARED_LIBS)
-    SET (OPENGL_gl_LIBRARY              /usr/X11R6/bin/libGL.dll)
-    SET (OPENGL_glu_LIBRARY             /usr/X11R6/bin/libGLU.dll)
-  ELSE (BUILD_SHARED_LIBS)
-    SET (OPENGL_gl_LIBRARY              /usr/X11R6/lib/libGL.dll.a)
-    SET (OPENGL_glu_LIBRARY             /usr/X11R6/lib/libGLU.dll.a)
-  ENDIF (BUILD_SHARED_LIBS)
+  IF(MANTA_ENABLE_X11)
+    SET (OPENGL_INCLUDE_DIR               /usr/X11R6/include)
+    IF (BUILD_SHARED_LIBS)
+      SET (OPENGL_gl_LIBRARY              /usr/X11R6/bin/libGL.dll)
+      SET (OPENGL_glu_LIBRARY             /usr/X11R6/bin/libGLU.dll)
+    ELSE (BUILD_SHARED_LIBS)
+      SET (OPENGL_gl_LIBRARY              /usr/X11R6/lib/libGL.dll.a)
+      SET (OPENGL_glu_LIBRARY             /usr/X11R6/lib/libGLU.dll.a)
+    ENDIF (BUILD_SHARED_LIBS)
+  ENDIF(MANTA_ENABLE_X11)
 ENDIF (CYGWIN)
 
 INCLUDE (${CMAKE_ROOT}/Modules/FindOpenGL.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/FindThreads.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/FindX11.cmake)
 
 SET(OPENGL_INCLUDE        ${OPENGL_INCLUDE_DIR})
 SET(OPENGL_LINK_LIBRARIES ${OPENGL_LIBRARIES})
+

Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt        (original)
+++ trunk/CMakeLists.txt        Wed Nov 28 15:26:11 2007
@@ -75,6 +75,8 @@
 INCLUDE (${CMAKE_CURRENT_SOURCE_DIR}/CMake/FindPabst.cmake)
 # Locate libxml2
 INCLUDE (${CMAKE_CURRENT_SOURCE_DIR}/CMake/FindLibXML2.cmake)
+# Find Threads
+INCLUDE (${CMAKE_ROOT}/Modules/FindThreads.cmake)
 
 SET(USE_STATS_COLLECTOR 0 CACHE BOOL "Enable stats collection")
 

Modified: trunk/Core/CMakeLists.txt
==============================================================================
--- trunk/Core/CMakeLists.txt   (original)
+++ trunk/Core/CMakeLists.txt   Wed Nov 28 15:26:11 2007
@@ -167,7 +167,9 @@
   ${SEMAPHORE_LIBRARY}
 )
 
-# The Manta_Core_XUtils library
-ADD_LIBRARY (Manta_Core_XUtils XUtils/XHelper.cc)
-TARGET_LINK_LIBRARIES(Manta_Core_XUtils Manta_Core)
-TARGET_LINK_LIBRARIES(Manta_Core_XUtils ${OPENGL_LIBRARIES} ${X11_LIBRARIES})
+IF(MANTA_ENABLE_X11)
+  # The Manta_Core_XUtils library
+  ADD_LIBRARY (Manta_Core_XUtils XUtils/XHelper.cc)
+  TARGET_LINK_LIBRARIES(Manta_Core_XUtils Manta_Core)
+  TARGET_LINK_LIBRARIES(Manta_Core_XUtils ${OPENGL_LIBRARIES} 
${X11_LIBRARIES})
+ENDIF(MANTA_ENABLE_X11)

Modified: trunk/Engine/Display/CMakeLists.txt
==============================================================================
--- trunk/Engine/Display/CMakeLists.txt (original)
+++ trunk/Engine/Display/CMakeLists.txt Wed Nov 28 15:26:11 2007
@@ -1,17 +1,20 @@
 
 SET (Manta_Display_SRCS
-     Display/FileDisplay.cc
-     Display/FileDisplay.h
-     Display/MultiDisplay.cc
-     Display/MultiDisplay.h
-     Display/NullDisplay.cc
-     Display/NullDisplay.h
-     Display/OpenGLDisplay.cc
-     Display/OpenGLDisplay.h
-     Display/PureOpenGLDisplay.cc
-     Display/PureOpenGLDisplay.h
-     Display/SyncDisplay.cc
-     Display/SyncDisplay.h
-)
-
+  Display/FileDisplay.cc
+  Display/FileDisplay.h
+  Display/MultiDisplay.cc
+  Display/MultiDisplay.h
+  Display/NullDisplay.cc
+  Display/NullDisplay.h
+  Display/PureOpenGLDisplay.cc
+  Display/PureOpenGLDisplay.h
+  Display/SyncDisplay.cc
+  Display/SyncDisplay.h
+  )
 
+IF(MANTA_ENABLE_X11)
+  SET (Manta_Display_SRCS ${Manta_Display_SRCS}
+    Display/OpenGLDisplay.cc
+    Display/OpenGLDisplay.h
+    )
+ENDIF(MANTA_ENABLE_X11)

Modified: trunk/Engine/Factory/CMakeLists.txt
==============================================================================
--- trunk/Engine/Factory/CMakeLists.txt (original)
+++ trunk/Engine/Factory/CMakeLists.txt Wed Nov 28 15:26:11 2007
@@ -7,6 +7,16 @@
   RegisterKnownComponents.h
   )
 
+IF(MANTA_ENABLE_X11)
+  SET(FLAG "-DMANTA_ENABLE_X11=1")
+ELSE(MANTA_ENABLE_X11)
+  SET(FLAG "-DMANTA_ENABLE_X11=0")
+ENDIF(MANTA_ENABLE_X11)
+
+SET_SOURCE_FILES_PROPERTIES(RegisterKnownComponents.cc
+  PROPERTIES COMPILE_FLAGS ${FLAG}
+  )
+
 ADD_LIBRARY (Manta_Factory
   ${Manta_Factory_SRCS}
   )

Modified: trunk/Engine/Factory/RegisterKnownComponents.cc
==============================================================================
--- trunk/Engine/Factory/RegisterKnownComponents.cc     (original)
+++ trunk/Engine/Factory/RegisterKnownComponents.cc     Wed Nov 28 15:26:11 
2007
@@ -28,7 +28,9 @@
 
 #include <Engine/Factory/Factory.h>
 #include <Engine/Display/NullDisplay.h>
-#include <Engine/Display/OpenGLDisplay.h>
+#if MANTA_ENABLE_X11
+#  include <Engine/Display/OpenGLDisplay.h>
+#endif
 #include <Engine/Display/FileDisplay.h>
 #include <Engine/IdleModes/ZoomIdleMode.h>
 #include <Engine/ImageTraversers/NullImageTraverser.h>
@@ -65,7 +67,9 @@
 #include <Model/Groups/GriddedGroup.h>
 #include <Model/Groups/Group.h>
 // #include <UserInterface/PromptUI.h>
-#include <UserInterface/XWindowUI.h>
+#if MANTA_ENABLE_X11
+#  include <UserInterface/XWindowUI.h>
+#endif
 #include <UserInterface/NullUI.h>
 #include <UserInterface/CameraPathAutomator.h>
 
@@ -79,7 +83,9 @@
   {
     // Register display components
     engine->registerComponent("null", &NullDisplay::create);
+#if MANTA_ENABLE_X11
     engine->registerComponent("opengl", &OpenGLDisplay::create);
+#endif
     engine->registerComponent("file", &FileDisplay::create);
 
     // Register image traversers
@@ -136,7 +142,9 @@
     // Register user interfaces
     engine->registerComponent("null", &NullUI::create);
     //     engine->registerComponent("prompt", &PromptUI::create);
+#if MANTA_ENABLE_X11
     engine->registerComponent("X", &XWindowUI::create);
+#endif
     engine->registerComponent("camerapath", &CameraPathAutomator::create);
 
     // Register groups

Modified: trunk/SwigInterface/CMakeLists.txt
==============================================================================
--- trunk/SwigInterface/CMakeLists.txt  (original)
+++ trunk/SwigInterface/CMakeLists.txt  Wed Nov 28 15:26:11 2007
@@ -77,6 +77,14 @@
 # Manta Runtime.
 SET_SOURCE_FILES_PROPERTIES(manta.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(manta.i PROPERTIES SWIG_FLAGS 
"${MANTA_SWIG_FLAGS}")
+
+IF(MANTA_ENABLE_X11)
+  SET(FLAG "-DMANTA_ENABLE_X11=1")
+ELSE(MANTA_ENABLE_X11)
+  SET(FLAG "-DMANTA_ENABLE_X11=0")
+ENDIF(MANTA_ENABLE_X11)
+SET_SOURCE_FILES_PROPERTIES(manta.i PROPERTIES SWIG_FLAGS ${FLAG})
+
 SWIG_ADD_MODULE(manta python manta.i manta.cc manta.h)
 
 # Squash some warnings

Modified: trunk/SwigInterface/manta.i
==============================================================================
--- trunk/SwigInterface/manta.i (original)
+++ trunk/SwigInterface/manta.i Wed Nov 28 15:26:11 2007
@@ -64,7 +64,9 @@
 
 %{
 #include <Engine/Display/SyncDisplay.h>
-#include <Engine/Display/OpenGLDisplay.h>
+#if MANTA_ENABLE_X11
+#  include <Engine/Display/OpenGLDisplay.h>
+#endif
 #include <Engine/Display/PureOpenGLDisplay.h>
 #include <Engine/Display/NullDisplay.h>
 #include <Engine/Display/FileDisplay.h>
@@ -89,7 +91,9 @@
 %manta_Manta_Exception(Manta::PureOpenGLDisplay::setMode);
 
 %include <Engine/Display/SyncDisplay.h>
+#if MANTA_ENABLE_X11
 %include <Engine/Display/OpenGLDisplay.h>
+#endif
 %include <Engine/Display/PureOpenGLDisplay.h>
 %include <Engine/Display/NullDisplay.h>
 %include <Engine/Display/FileDisplay.h>

Modified: trunk/UserInterface/CMakeLists.txt
==============================================================================
--- trunk/UserInterface/CMakeLists.txt  (original)
+++ trunk/UserInterface/CMakeLists.txt  Wed Nov 28 15:26:11 2007
@@ -1,5 +1,5 @@
 
-ADD_LIBRARY (Manta_UserInterface
+SET(Manta_UserInterface_SRCS
   AutomatorUI.h
   AutomatorUI.cc
   CameraPathAutomator.h
@@ -9,13 +9,19 @@
   # PromptUI.cc
   SyncFrameAutomator.cc
   SyncFrameAutomator.h
-  XWindowUI.h
-  XWindowUI.cc
   )
 
+IF(MANTA_ENABLE_X11)
+  SET(Manta_UserInterface_SRCS ${Manta_UserInterface_SRCS}
+    XWindowUI.h
+    XWindowUI.cc
+    )
+ENDIF(MANTA_ENABLE_X11)
+
+ADD_LIBRARY( Manta_UserInterface ${Manta_UserInterface_SRCS} )
+
 TARGET_LINK_LIBRARIES(Manta_UserInterface 
                       Manta_Engine 
                       Manta_Interface
                       Manta_Core_XUtils 
                       Manta_Core)
-TARGET_LINK_LIBRARIES(Manta_UserInterface ${OPENGL_LIBRARIES} 
${X11_LIBRARIES})

---

• [Manta] r1882 - in trunk: . CMake Core Engine/Display Engine/Factory SwigInterface UserInterface, bigler, 11/28/2007

---

Archive powered by MHonArc 2.6.16.