Text archives Help

---

Author: bigler
Date: Fri Oct  6 14:26:23 2006
New Revision: 1207

Modified:
   trunk/CMakeLists.txt
   trunk/Core/CMakeLists.txt
   trunk/Engine/CMakeLists.txt
   trunk/Engine/Factory/CMakeLists.txt
   trunk/Image/CMakeLists.txt
   trunk/Interface/CMakeLists.txt
   trunk/Model/CMakeLists.txt
   trunk/UserInterface/CMakeLists.txt
   trunk/scenes/CMakeLists.txt
Log:

Some fixes for building under Cygwin using static linking.  Shared
libraries seem kind of broken.  I'll try and track it down later, but
for now it looks like it's somewhere initializing global variables.
The ones in SSEDefs.h trigger the debugger, but I haven't checked to
see if these are the problem.

CMakeLists.txt

  If on Cygwin build static libraries.

  Reorder libraries for proper linking order (important for static
  linking).

Core/CMakeLists.txt
Engine/CMakeLists.txt
Engine/Factory/CMakeLists.txt
Image/CMakeLists.txt
Interface/CMakeLists.txt
Model/CMakeLists.txt
UserInterface/CMakeLists.txt

  Reorder libraries for proper linking order (important for static
  linking).

scenes/CMakeLists.txt

  Need to force these scenes to built as shared libraries, so they can
  be loaded during run time.


Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt        (original)
+++ trunk/CMakeLists.txt        Fri Oct  6 14:26:23 2006
@@ -13,6 +13,13 @@
 PROJECT (Manta)
 
 SET(BUILD_SHARED_LIBS ON)
+IF (CYGWIN)
+  # I can't get Manta to run with shared libraries.  This, at least,
+  # let's me run for now.  I'm not sure how this will work for the
+  # wxPython version.
+  SET(BUILD_SHARED_LIBS OFF)
+ENDIF (CYGWIN)
+
 SET(CMAKE_VERBOSE_MAKEFILE ON)
 
 ############################################################
@@ -67,14 +74,14 @@
   )
 
 SET(MANTA_TARGET_LINK_LIBRARIES
-  Manta_Engine
   Manta_Factory
   Manta_UserInterface
+  Manta_Engine
   Manta_Model
   Manta_Image
   Manta_Interface
-  Manta_Core
   Manta_Core_XUtils
+  Manta_Core
   SCIRun_Core
   About
   )

Modified: trunk/Core/CMakeLists.txt
==============================================================================
--- trunk/Core/CMakeLists.txt   (original)
+++ trunk/Core/CMakeLists.txt   Fri Oct  6 14:26:23 2006
@@ -71,6 +71,6 @@
 
 # The Manta_Core_XUtils library
 ADD_LIBRARY (Manta_Core_XUtils XUtils/XHelper.cc)
-TARGET_LINK_LIBRARIES(Manta_Core_XUtils SCIRun_Core Manta_Core)
+TARGET_LINK_LIBRARIES(Manta_Core_XUtils Manta_Core SCIRun_Core)
 TARGET_LINK_LIBRARIES(Manta_Core_XUtils ${OPENGL_LIBRARIES} ${X11_LIBRARIES})
 

Modified: trunk/Engine/CMakeLists.txt
==============================================================================
--- trunk/Engine/CMakeLists.txt (original)
+++ trunk/Engine/CMakeLists.txt Fri Oct  6 14:26:23 2006
@@ -25,8 +25,8 @@
 TARGET_LINK_LIBRARIES(Manta_Engine Manta_Model
                                    Manta_Image
                                    Manta_Interface
-                                   Manta_Core
                                    Manta_Core_XUtils
+                                   Manta_Core
                                    SCIRun_Core
                                    )
 

Modified: trunk/Engine/Factory/CMakeLists.txt
==============================================================================
--- trunk/Engine/Factory/CMakeLists.txt (original)
+++ trunk/Engine/Factory/CMakeLists.txt Fri Oct  6 14:26:23 2006
@@ -10,8 +10,8 @@
   )
 
 TARGET_LINK_LIBRARIES(Manta_Factory
-  Manta_Engine
   Manta_UserInterface
+  Manta_Engine
   Manta_Model
   Manta_Image
   Manta_Interface

Modified: trunk/Image/CMakeLists.txt
==============================================================================
--- trunk/Image/CMakeLists.txt  (original)
+++ trunk/Image/CMakeLists.txt  Fri Oct  6 14:26:23 2006
@@ -43,6 +43,6 @@
 
 TARGET_LINK_LIBRARIES(Manta_Image
                       Manta_Interface 
-                      SCIRun_Core 
                       Manta_Core
+                      SCIRun_Core 
                       ${NRRD_IMAGE_LIB})

Modified: trunk/Interface/CMakeLists.txt
==============================================================================
--- trunk/Interface/CMakeLists.txt      (original)
+++ trunk/Interface/CMakeLists.txt      Fri Oct  6 14:26:23 2006
@@ -58,4 +58,4 @@
        CallbackHandle.h
         )
 
-TARGET_LINK_LIBRARIES(Manta_Interface SCIRun_Core Manta_Core)
+TARGET_LINK_LIBRARIES(Manta_Interface Manta_Core SCIRun_Core )

Modified: trunk/Model/CMakeLists.txt
==============================================================================
--- trunk/Model/CMakeLists.txt  (original)
+++ trunk/Model/CMakeLists.txt  Fri Oct  6 14:26:23 2006
@@ -35,7 +35,7 @@
              ${Manta_Textures_SRCS}
              )
 
-TARGET_LINK_LIBRARIES(Manta_Model Manta_Interface Manta_Core Manta_Image)
+TARGET_LINK_LIBRARIES(Manta_Model Manta_Image Manta_Interface Manta_Core)
 
 #IF(BUILD_DYNLT)
 #  TARGET_LINK_LIBRARIES(Manta_Model Manta_DynLT)

Modified: trunk/UserInterface/CMakeLists.txt
==============================================================================
--- trunk/UserInterface/CMakeLists.txt  (original)
+++ trunk/UserInterface/CMakeLists.txt  Fri Oct  6 14:26:23 2006
@@ -13,6 +13,6 @@
   XWindowUI.cc
   )
 
-TARGET_LINK_LIBRARIES(Manta_UserInterface Manta_Interface Manta_Engine
+TARGET_LINK_LIBRARIES(Manta_UserInterface Manta_Engine Manta_Interface
                       Manta_Core_XUtils Manta_Core)
 TARGET_LINK_LIBRARIES(Manta_UserInterface ${OPENGL_LIBRARIES} 
${X11_LIBRARIES})

Modified: trunk/scenes/CMakeLists.txt
==============================================================================
--- trunk/scenes/CMakeLists.txt (original)
+++ trunk/scenes/CMakeLists.txt Fri Oct  6 14:26:23 2006
@@ -1,4 +1,6 @@
 
+SET(BUILD_SHARED_LIBS ON)
+
 ############################################################
 # Initial test scenes.
 

---

• [MANTA] r1207 - in trunk: . Core Engine Engine/Factory Image Interface Model UserInterface scenes, bigler, 10/06/2006

---

Archive powered by MHonArc 2.6.16.