ogre19-fix-framework-headers.diff

# HG changeset patch
# User Nikolay Kasyanov <corrmage@gmail.com>
# Date 1392318881 -14400
# Branch xcodeless-build-fixes
# Node ID 25cc89793bddebd59bb20f9edb5053952095eb94
# Parent  82b0e7ad3d1c215584811509977957ea9b0cc4a0
Don't use Xcode variables for non-Xcode builds

diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt
--- a/OgreMain/CMakeLists.txt
+++ b/OgreMain/CMakeLists.txt
@@ -302,7 +302,11 @@
         LINK_FLAGS "-framework IOKit -framework Cocoa -framework Carbon -framework OpenGL -framework CoreVideo"
     )
 
-    set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)")
+    if(CMAKE_GENERATOR STREQUAL "Xcode")
+      set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)")
+    else()
+      set(OGRE_OSX_BUILD_CONFIGURATION "Frameworks")
+    endif()
   
   	add_custom_command(TARGET OgreMain POST_BUILD
 		COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading

ogre19-install-name-fix.diff

# HG changeset patch
# User Nikolay Kasyanov <corrmage@gmail.com>
# Date 1392318763 -14400
# Branch xcodeless-build-fixes
# Node ID 82b0e7ad3d1c215584811509977957ea9b0cc4a0
# Parent  dd30349ea6670e3cd962d9d41a8039de3a3482d3
Proper install name for frameworks

diff --git a/CMake/Utils/OgreConfigTargets.cmake b/CMake/Utils/OgreConfigTargets.cmake
--- a/CMake/Utils/OgreConfigTargets.cmake
+++ b/CMake/Utils/OgreConfigTargets.cmake
@@ -257,7 +257,7 @@
       # Set the INSTALL_PATH so that frameworks can be installed in the application package
       set_target_properties(${LIBNAME}
          PROPERTIES BUILD_WITH_INSTALL_RPATH 1
-         INSTALL_NAME_DIR "@executable_path/../Frameworks"
+         INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/${PLATFORM_NAME}/${CMAKE_BUILD_TYPE}"
       )
       set_target_properties(${LIBNAME} PROPERTIES PUBLIC_HEADER "${HEADER_FILES} ${PLATFORM_HEADERS}")
       set_target_properties(${LIBNAME} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")