Commits

Shankar Giri committed d4a64f2

Fixed a silly mistake I made in previous commit, plus fixed set_target_properties for all Dependencies and main programs for the Mac.

Comments (0)

Files changed (8)

Dependencies/Caelum-0.5.0/main/CMakeLists.txt

 
 ENDIF(UNIX AND NOT APPLE)
 
+IF (APPLE)
+        set_target_properties(Caelum PROPERTIES OUTPUT_NAME Caelum_Ogitor)
+        # Set the INSTALL_PATH so that Frameworks can be local
+        set_target_properties(Caelum PROPERTIES BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR "@executable_path/../Components")
+   ENDIF(APPLE)
+
 # vim: set sw=2 ts=2 noet:

Dependencies/GenericImageEditor/CMakeLists.txt

 
     ENDIF(UNIX AND NOT APPLE)
 
+   IF (APPLE)
+        set_target_properties(GenericImageEditor PROPERTIES OUTPUT_NAME GenericImageEditor)
+        # Set the INSTALL_PATH so that Frameworks can be local
+        set_target_properties(GenericImageEditor PROPERTIES BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR "@executable_path/../Components")
+   ENDIF(APPLE)
+
 endif(NOT QT4_FOUND)
 
 # vim: set sw=2 ts=2 noet:

Dependencies/GenericTextEditor/CMakeLists.txt

 
     ENDIF(UNIX AND NOT APPLE)
 
+    IF (APPLE)
+        set_target_properties(GenericTextEditor PROPERTIES OUTPUT_NAME GenericTextEditor)
+        # Set the INSTALL_PATH so that Frameworks can be local
+        set_target_properties(GenericTextEditor PROPERTIES BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR "@executable_path/../Components")
+    ENDIF(APPLE)
+
 endif(NOT QT4_FOUND)
 
 # vim: set sw=2 ts=2 noet:

Dependencies/HYDRAX/Hydrax/src/Hydrax/CMakeLists.txt

     endif(OGITOR_DIST)
 
 ENDIF(UNIX AND NOT APPLE)
+
+
+IF (APPLE)
+        set_target_properties(Hydrax PROPERTIES OUTPUT_NAME Hydrax_Ogitor)
+        # Set the INSTALL_PATH so that Frameworks can be local
+        set_target_properties(Hydrax PROPERTIES BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR "@executable_path/../Components")
+   ENDIF(APPLE)
+

Dependencies/OFS/CMakeLists.txt

         CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
 
 ENDIF(UNIX AND NOT APPLE)
+
+IF (APPLE)
+        set_target_properties(OFS PROPERTIES OUTPUT_NAME OFS)
+        # Set the INSTALL_PATH so that Frameworks can be local
+        set_target_properties(OFS PROPERTIES BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR "@executable_path/../Components")
+   ENDIF(APPLE)
+
+

Dependencies/SkyX/CMakeLists.txt

 
 ENDIF(UNIX AND NOT APPLE)
 
+IF (APPLE)
+        set_target_properties(Skyx PROPERTIES OUTPUT_NAME Skyx_Ogitor)
+        # Set the INSTALL_PATH so that Frameworks can be local
+        set_target_properties(Skyx PROPERTIES BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR "@executable_path/../Components")
+   ENDIF(APPLE)
+
 # vim: set sw=2 ts=2 noet:

Ogitor/CMakeLists.txt

 
 if(APPLE)
         find_package(Cocoa REQUIRED)
-	message(STATUS ${Cocoa_LIBRARIES})
+        if (NOT OGRE_Paging_FOUND OR NOT OGRE_Terrain_FOUND)
+            message(FATAL_ERROR "OGRE Paging and Terrain Components are required dependencies. If you are sure you have them, make sure to set OGRE_SDK to the correct path.")
+        endif(NOT OGRE_Paging_FOUND OR NOT OGRE_Terrain_FOUND)
 	target_link_libraries(Ogitor ${Cocoa_LIBRARIES} ${OGRE_LIBRARY} ${OGRE_Terrain_LIBRARY} ${OGRE_Paging_LIBRARY} PagedGeometry OFS ${Boost_LIBRARIES})
 	# Setup to be a framework
 	set_target_properties(Ogitor PROPERTIES FRAMEWORK TRUE)

qtOgitor/CMakeLists.txt

         set(MakeBundle
             cp ${QtSolutions_PropertyBrowser_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libQtSolutions_PropertyBrowser*.dylib ${OGRE_Terrain_LIBRARY_DBG} ${OGRE_Paging_LIBRARY_DBG} ${qtOgitorLocationAppdir}/Contents/Components && 
             cp ${OGRE_RenderSystem_GL_LIBRARY_DBG} ${OGRE_Plugin_OctreeSceneManager_LIBRARY_DBG} ${OGRE_Plugin_ParticleFX_LIBRARY_DBG} ${OGRE_Plugin_CgProgramManager_LIBRARY_DBG} ${qtOgitorLocationAppdir}/Contents/Plugins && 
-            cp -r ${OGRE_LIBRARY}/{CMAKE_BUILD_TYPE}/Ogre.framework ${qtOgitorLocationAppdir}/Contents/Frameworks && 
+            cp -r ${OGRE_LIBRARY} ${qtOgitorLocationAppdir}/Contents/Frameworks && 
             cp -r ../lib/${CMAKE_CFG_INTDIR}/Ogitor.framework ${qtOgitorLocationAppdir}/Contents/Frameworks && 
             cp ../Plugins/lib/${CMAKE_CFG_INTDIR}/libOgCaelum*.dylib ../Plugins/lib/${CMAKE_CFG_INTDIR}/libOgHydrax*.dylib ../Plugins/lib/${CMAKE_CFG_INTDIR}/libOgModularZone*.dylib ../Plugins/lib/${CMAKE_CFG_INTDIR}/libOgSkyx*.dylib ../Plugins/lib/${CMAKE_CFG_INTDIR}/libDotSceneSerializer*.dylib ${qtOgitorLocationAppdir}/Contents/Plugins/Ogitor && 
             cp -r ../RunPath/Media ${qtOgitorLocationAppdir}/Contents/Resources && 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.