Text archives Help

---

Author: abe
Date: Wed Nov  7 21:48:32 2007
New Revision: 1836

Modified:
   trunk/SwigInterface/CMakeLists.txt
Log:

Fixed cyclic re-export error on Leopard for wxManta interface.

M    SwigInterface/CMakeLists.txt


Modified: trunk/SwigInterface/CMakeLists.txt
==============================================================================
--- trunk/SwigInterface/CMakeLists.txt  (original)
+++ trunk/SwigInterface/CMakeLists.txt  Wed Nov  7 21:48:32 2007
@@ -56,6 +56,7 @@
 # Manta Interface.
 SET_SOURCE_FILES_PROPERTIES(mantainterface.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(mantainterface.i PROPERTIES SWIG_FLAGS 
"${MANTA_SWIG_FLAGS}")
+
 SWIG_ADD_MODULE(mantainterface python mantainterface.i manta.cc manta.h)
 
 SWIG_LINK_LIBRARIES(mantainterface
@@ -67,6 +68,12 @@
   -lm)
 ADD_DEPENDENCIES(_mantainterface ${MANTA_TARGET_LINK_LIBRARIES})
 
+IF (APPLE_LEOPARD_LD)
+  SET_TARGET_PROPERTIES(_mantainterface PROPERTIES 
+    LINK_FLAGS 
"-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
+    )
+ENDIF (APPLE_LEOPARD_LD)
+
 ############################################################
 # Manta Runtime.
 SET_SOURCE_FILES_PROPERTIES(manta.i PROPERTIES CPLUSPLUS ON)
@@ -94,6 +101,14 @@
   ${X11_LIBRARIES}
   -lm)
 ADD_DEPENDENCIES(_manta ${MANTA_TARGET_LINK_LIBRARIES})
+
+
+IF (APPLE_LEOPARD_LD)
+  SET_TARGET_PROPERTIES(_manta PROPERTIES 
+    LINK_FLAGS 
"-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
+    )
+ENDIF (APPLE_LEOPARD_LD)
+
 
 # X11 Interface.
 PYTHON_POST_BUILD_COPY(runmanta.py)

---

• [Manta] r1836 - trunk/SwigInterface, abe, 11/07/2007
  • Re: [Manta] r1836 - trunk/SwigInterface, Abe Stephens, 11/07/2007
    • Re: [Manta] r1836 - trunk/SwigInterface, Solomon Boulos, 11/07/2007
      • Re: [Manta] r1836 - trunk/SwigInterface, Chems Touati, 11/08/2007
        • Re: [Manta] r1836 - trunk/SwigInterface, Solomon Boulos, 11/08/2007
          • Re: [Manta] r1836 - trunk/SwigInterface, Thiago Ize, 11/08/2007
          • Re: [Manta] r1836 - trunk/SwigInterface, Chems Touati, 11/08/2007
            • Re: [Manta] r1836 - trunk/SwigInterface, Chems Touati, 11/08/2007

---

Archive powered by MHonArc 2.6.16.