Commits

Anonymous committed 2417b39 Merge

Gentoo compile fixes merged

  • Participants
  • Parent commits aa8e8f2, 7bb9185

Comments (0)

Files changed (1)

File CMakeLists.txt

 
 if (WIN32) 
 	set(BOOST_ROOT "${OGRE_HOME}/boost_1_42")
-	set(CMAKE_MODULE_PATH "${OGRE_HOME}/CMake/;${CMAKE_MODULE_PATH}")
+	set(CMAKE_MODULE_PATH "${OGRE_HOME}/CMake/;${CMAKE_MODULE_PATH}")
 elseif (APPLE)
 	set(OGRE_SDK "${OGRE_HOME}")
 	get_filename_component(OGRE_ROOT_DIR "${OGRE_SDK}" ABSOLUTE)
 	set(CMAKE_MODULE_PATH "${OGRE_ROOT_DIR}/CMake")
 	set(BOOST_ROOT "${OGRE_ROOT_DIR}/boost_1_42")
 else ()
-	set(CMAKE_MODULE_PATH "${OGRE_HOME}/CMake/;/usr/local/lib/OGRE/CMake/;${CMAKE_MODULE_PATH}")
+	set(CMAKE_MODULE_PATH "${OGRE_HOME}/CMake/;/usr/local/lib/OGRE/CMake/;/usr/lib/OGRE/cmake/;/usr/lib64/OGRE/cmake/;${CMAKE_MODULE_PATH}")
 endif()
 
 # Cmake framework stuff to make frameworks actually work.
     MARK_AS_ADVANCED (CARBON_LIBRARY)
     MARK_AS_ADVANCED (CG_LIBRARY)
     SET(EXTRA_LIBS ${OGRE_LIBRARY} ${IOKit_LIBRARY} ${CARBON_LIBRARY} ${CG_LIBRARY})    
-ENDIF (APPLE)
+ENDIF (APPLE)
 
 if (CMAKE_BUILD_TYPE STREQUAL "")
   set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release" FORCE)
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   ADD_DEFINITIONS(-DDEBUG)
 endif ()
-
+
 if (NOT APPLE)
-	set(CMAKE_DEBUG_POSTFIX "_d")
+	set(CMAKE_DEBUG_POSTFIX "_d")
 endif()
 
 set(OGRE_LIB_TYPE SHARED)
     MESSAGE(SEND_ERROR "Failed to find OIS.")
     return ()
 ENDIF()
- 
-if (APPLE)
-    set(CMAKE_OSX_ARCHITECTURES "i386")
-    include_directories("${OGRE_HOME}/include/OGRE/OSX")
-    include_directories("${OGRE_HOME}/include/OGRE/")
-endif(APPLE)
+ 
+if (APPLE)
+    set(CMAKE_OSX_ARCHITECTURES "i386")
+    include_directories("${OGRE_HOME}/include/OGRE/OSX")
+    include_directories("${OGRE_HOME}/include/OGRE/")
+endif(APPLE)
 
 # Find Boost
 # Prefer static linking in all cases
 
 # LevelDataConverter
 add_subdirectory(tools/LevelDataConverter)
- 
+