Changeset 11341 for OpenSceneGraph/trunk/src/osgViewer/CMakeLists.txt

Timestamp:

04/19/10 15:44:42 (3 years ago)

Author:

robert

Message:

From Stephan Huber and Mathieu Marache, "attached you'll find framework support for os x via cmake. Please credit
Mathieu Marache, he added the last missing piece to this puzzle.

I think it is safe to commit these changes to trunk, as the traditional
way via dylibs should work as before.

Here's some more info how to get frameworks:

With these modifications it is possible to compile frameworks on OS X,
when you set the Cmake-option OSG_COMPILE_FRAMEWORKS to true. If you
want to embed the frameworks in your app-bundle make sure to set
OSG_COMPILE_FRAMEWORKS_INSTALL_NAME_DIR accordingly.

You'll have to build the install-target of the generated xcode-projects
as this sets the install_name_dirs of the frameworks and plugins."

Files:

• OpenSceneGraph/trunk/src/osgViewer/CMakeLists.txt (modified) (4 diffs)

OpenSceneGraph/trunk/src/osgViewer/CMakeLists.txt

@@ -1 @@
-
 # FIXME: For OS X, need flag for Framework or dylib
 IF(DYNAMIC_OPENSCENEGRAPH)
@@ -71 +70 @@
     
     IF(${OSG_WINDOWING_SYSTEM} STREQUAL "Cocoa")
-        ADD_DEFINITIONS(-DUSE_DARWIN_COCOA_IMPLEMENTATION)
-        SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS} 
-            ${HEADER_PATH}/api/Cocoa/GraphicsHandleCocoa
-            ${HEADER_PATH}/api/Cocoa/GraphicsWindowCocoa
-            ${HEADER_PATH}/api/Cocoa/PixelBufferCocoa
-        )
+        ADD_DEFINITIONS(-DUSE_DARWIN_COCOA_IMPLEMENTATION)    
+ 
+        IF(OSG_COMPILE_FRAMEWORKS)
+           SET(LIB_COMMON_FILES ${LIB_COMMON_FILES} 
+                 ${HEADER_PATH}/api/Cocoa/GraphicsHandleCocoa
+                 ${HEADER_PATH}/api/Cocoa/GraphicsWindowCocoa
+                 ${HEADER_PATH}/api/Cocoa/PixelBufferCocoa
+             )
+            SET_PROPERTY(SOURCE ${HEADER_PATH}/api/Cocoa/GraphicsHandleCocoa PROPERTY MACOSX_PACKAGE_LOCATION Headers/api/Cocoa) 
+            SET_PROPERTY(SOURCE ${HEADER_PATH}/api/Cocoa/GraphicsWindowCocoa PROPERTY MACOSX_PACKAGE_LOCATION Headers/api/Cocoa)
+            SET_PROPERTY(SOURCE ${HEADER_PATH}/api/Cocoa/PixelBufferCocoa PROPERTY MACOSX_PACKAGE_LOCATION Headers/api/Cocoa)
+        ELSE()
+            SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS} 
+                ${HEADER_PATH}/api/Cocoa/GraphicsHandleCocoa
+                ${HEADER_PATH}/api/Cocoa/GraphicsWindowCocoa
+                ${HEADER_PATH}/api/Cocoa/PixelBufferCocoa
+            )
+        ENDIF()  
+  
         SET(LIB_COMMON_FILES ${LIB_COMMON_FILES} 
             GraphicsWindowCocoa.mm
@@ -83 +95 @@
             PixelBufferCocoa.mm
         )
-    SET(LIB_EXTRA_LIBS ${COCOA_LIBRARY} ${LIB_EXTRA_LIBS})
+        SET(LIB_EXTRA_LIBS ${COCOA_LIBRARY} ${LIB_EXTRA_LIBS})
     ELSEIF(${OSG_WINDOWING_SYSTEM} STREQUAL "Carbon")
-        ADD_DEFINITIONS(-DUSE_DARWIN_CARBON_IMPLEMENTATION)
-        SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS} 
-            ${HEADER_PATH}/api/Carbon/GraphicsHandleCarbon
-            ${HEADER_PATH}/api/Carbon/GraphicsWindowCarbon
-            ${HEADER_PATH}/api/Carbon/PixelBufferCarbon
-        )
+        ADD_DEFINITIONS(-DUSE_DARWIN_CARBON_IMPLEMENTATION)     
+ 
+        IF(OSG_COMPILE_FRAMEWORKS)
+           SET(LIB_COMMON_FILES ${LIB_COMMON_FILES} 
+                 ${HEADER_PATH}/api/Carbon/GraphicsHandleCarbon
+                 ${HEADER_PATH}/api/Carbon/GraphicsWindowCarbon
+                 ${HEADER_PATH}/api/Carbon/PixelBufferCarbon
+             )
+            SET_PROPERTY(SOURCE ${HEADER_PATH}/api/Carbon/GraphicsHandleCarbon PROPERTY MACOSX_PACKAGE_LOCATION Headers/api/Carbon) 
+            SET_PROPERTY(SOURCE ${HEADER_PATH}/api/Carbon/GraphicsWindowCarbon PROPERTY MACOSX_PACKAGE_LOCATION Headers/api/Carbon)
+            SET_PROPERTY(SOURCE ${HEADER_PATH}/api/Carbon/PixelBufferCarbon PROPERTY MACOSX_PACKAGE_LOCATION Headers/api/Carbon)
+        ELSE()
+            SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS} 
+                ${HEADER_PATH}/api/Carbon/GraphicsHandleCarbon
+                ${HEADER_PATH}/api/Carbon/GraphicsWindowCarbon
+                ${HEADER_PATH}/api/Carbon/PixelBufferCarbon
+            )
+        ENDIF()   
+ 
         SET(LIB_COMMON_FILES ${LIB_COMMON_FILES} 
             GraphicsWindowCarbon.cpp
@@ -97 +122 @@
             PixelBufferCarbon.cpp
         )
+        
         SET(LIB_EXTRA_LIBS ${COCOA_LIBRARY} ${LIB_EXTRA_LIBS})
     ELSE()