File libhydrax-0.5.4-6-fixes.patch of Package ogre-hydrax

Overview Repositories Revisions Requests Users Attributes Meta

File libhydrax-0.5.4-6-fixes.patch of Package ogre-hydrax (Revision 7503c91ed6166358b51c117dfedb9513)

Currently displaying revision 7503c91ed6166358b51c117dfedb9513 , Show latest

diff -uNr ../hydrax.orig/CMakeLists.txt ./CMakeLists.txt
--- ../hydrax.orig/CMakeLists.txt	2013-06-13 09:28:45.390328414 -0500
+++ ./CMakeLists.txt	2013-06-13 10:44:06.973581244 -0500
@@ -1,6 +1,3 @@
-# TODO/NOTE Tested only on Windows
-# Requires that OGRE_HOME (and BOOST_ROOT or TBB_HOME, if applicable) environment variables are set in advance.
-
 cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0003 NEW)
 
@@ -26,10 +23,8 @@
     set(CMAKE_DEBUG_POSTFIX "d")
 endif()
 
-if ("${OGRE_HOME}" STREQUAL "")
-    file(TO_CMAKE_PATH "$ENV{OGRE_HOME}" OGRE_HOME)
-    set(OGRE_HOME ${OGRE_HOME} CACHE PATH "OGRE_HOME dependency path" FORCE)
-endif()
+find_package(OGRE)
+
 if ("${TBB_HOME}" STREQUAL "")
     file(TO_CMAKE_PATH "$ENV{TBB_HOME}" TBB_HOME)
     set(TBB_HOME ${TBB_HOME} CACHE PATH "TBB_HOME dependency path" FORCE)
@@ -63,7 +58,7 @@
 endif()
 set(TBB_LIB_VER ${TBB_ARCH}/${TBB_VC_VER})
 
-link_directories(${OGRE_HOME}/lib/$(ConfigurationName) ${BOOST_ROOT}/stage/lib ${TBB_HOME}/lib/${TBB_LIB_VER})
+# link_directories(${OGRE_HOME}/lib/$(ConfigurationName) ${BOOST_ROOT}/stage/lib ${TBB_HOME}/lib/${TBB_LIB_VER})
 
 add_library(Hydrax SHARED ${sourceFiles} ${headerFiles})
 
@@ -76,12 +71,15 @@
 #message("Hydrax TBB lib path    = " ${TBB_HOME}/lib/${TBB_LIB_VER})
 
 IF (APPLE)
-    include_directories(${OGRE_HOME}/lib/relwithdebinfo/Ogre.framework/Headers ${BOOST_ROOT})
+    include_directories(${BOOST_ROOT})
     target_link_libraries(Hydrax ${EXTRA_LIBS})
 ELSE ()
-    include_directories(${OGRE_HOME}/include/OGRE ${BOOST_ROOT} ${TBB_HOME}/include)
-    target_link_libraries(Hydrax optimized OgreMain.lib debug OgreMain_d.lib)
+    include_directories(${BOOST_ROOT} ${TBB_HOME}/include)
 ENDIF ()
+
+include_directories(${OGRE_INCLUDE_DIRS})
+target_link_libraries(Hydrax ${OGRE_LIBRARIES})
+
 target_link_libraries(Hydrax ${EXTRA_LIBS})
 set_target_properties(Hydrax PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib
@@ -117,5 +115,15 @@
     INSTALL(FILES ${INST_FILES} DESTINATION include/Hydrax)
     INSTALL(DIRECTORY ${INST_DIRS} DESTINATION include/Hydrax)
     INSTALL(TARGETS Hydrax LIBRARY DESTINATION lib)
+elseif(UNIX)
+
+	set(INSTALL_INCLUDE_DIR include/${PROJECT_NAME} CACHE PATH "Installation directory for header files")
+	set(INSTALL_LIB_DIR lib/${PROJECT_NAME} CACHE PATH "Installation directory for libraries")
+	set(INSTALL_DATA_DIR share/${PROJECT_NAME} CACHE PATH "Installation directory for data files")
+
+	INSTALL(DIRECTORY include/ DESTINATION ${INSTALL_INCLUDE_DIR})
+	INSTALL(TARGETS Hydrax LIBRARY DESTINATION ${INSTALL_LIB_DIR})
+	INSTALL(DIRECTORY Media/Hydrax/ DESTINATION ${INSTALL_DATA_DIR})
+
 endif()

Places

File libhydrax-0.5.4-6-fixes.patch of Package ogre-hydrax (Revision 7503c91ed6166358b51c117dfedb9513)

Places