Revision: 1440
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1440&view=rev
Author: rorthomas
Date: 2010-07-13 20:52:56 +0000 (Tue, 13 Jul 2010)
Log Message:
-----------
splitted ogre components into separate variables for the buildsystem to be more
compatible with the linux version
Modified Paths:
--------------
trunk/CMakeDependenciesConfig.txt
trunk/source/main/CMakeLists.txt
Modified: trunk/CMakeDependenciesConfig.txt
===================================================================
--- trunk/CMakeDependenciesConfig.txt 2010-07-13 20:37:47 UTC (rev 1439)
+++ trunk/CMakeDependenciesConfig.txt 2010-07-13 20:52:56 UTC (rev 1440)
@@ -29,10 +29,18 @@
endif(NOT ROR_DEPENDENCIES_DIR)
#### REQUIRED COMPONENTS
- set(Ogre_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/Ogre;${ROR_DEPENDENCIES_DIR}/include/Ogre/Terrain;${ROR_DEPENDENCIES_DIR}/include/Ogre/Paging"
CACHE PATH "The ogre include path to use")
+ set(Ogre_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/include/Ogre"
CACHE PATH "The ogre include path to use")
set(Ogre_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib" CACHE PATH
"The ogre lib path to use")
- set(Ogre_LIBRARIES "OgreMain;OgrePaging;OgreTerrain" CACHE
STRING "The ogre lib to link against")
+ set(Ogre_LIBRARIES "OgreMain" CACHE STRING "The ogre lib to
link against")
+ set(Ogre_Terrain_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/Ogre/Paging" CACHE PATH "The ogre terrain
include path to use")
+ set(Ogre_Terrain_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The ogre terrain lib path to use")
+ set(Ogre_Terrain_LIBRARIES "OgreTerrain" CACHE STRING "The ogre
terrain lib to link against")
+
+ set(Ogre_Paging_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/Ogre/Terrain" CACHE PATH "The ogre Paging
include path to use")
+ set(Ogre_Paging_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The ogre Paging lib path to use")
+ set(Ogre_Paging_LIBRARIES "OgrePaging" CACHE STRING "The ogre
Paging lib to link against")
+
set(Ois_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/include/ois"
CACHE PATH "The OIS include path to use")
set(Ois_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib" CACHE PATH
"The OIS lib path to use")
set(Ois_LIBRARIES "ois" CACHE STRING "The ogre lib to link
against")
@@ -141,8 +149,8 @@
PKG_CHECK_MODULES (Ogre OGRE REQUIRED)
# Ogre components
- PKG_CHECK_MODULES (Ogre-Terrain OGRE-Terrain REQUIRED)
- PKG_CHECK_MODULES (Ogre-Paging OGRE-Paging REQUIRED)
+ PKG_CHECK_MODULES (Ogre_Terrain OGRE-Terrain REQUIRED)
+ PKG_CHECK_MODULES (Ogre_Paging OGRE-Paging REQUIRED)
PKG_CHECK_MODULES (Ois OIS REQUIRED)
Modified: trunk/source/main/CMakeLists.txt
===================================================================
--- trunk/source/main/CMakeLists.txt 2010-07-13 20:37:47 UTC (rev 1439)
+++ trunk/source/main/CMakeLists.txt 2010-07-13 20:52:56 UTC (rev 1440)
@@ -41,6 +41,10 @@
# required components
include_directories(${Ogre_INCLUDE_DIRS})
link_directories (${Ogre_LIBRARY_DIRS})
+include_directories(${Ogre_Terrain_INCLUDE_DIRS})
+link_directories (${Ogre_Terrain_LIBRARY_DIRS})
+include_directories(${Ogre_Paging_INCLUDE_DIRS})
+link_directories (${Ogre_Paging_LIBRARY_DIRS})
include_directories(${Ois_INCLUDE_DIRS})
link_directories (${Ois_LIBRARY_DIRS})
@@ -65,6 +69,6 @@
endif(ROR_USE_OIS_G27)
add_executable(RoR ${HEADER_FILES} ${SOURCE_FILES})
-target_link_libraries(RoR ${Ogre_LIBRARIES} ${Ois_LIBRARIES} ${OS_LIBS}
${optional_libs})
+target_link_libraries(RoR ${Ogre_LIBRARIES} ${Ogre_Terrain_LIBRARIES}
${Ogre_Paging_LIBRARIES} ${Ois_LIBRARIES} ${OS_LIBS} ${optional_libs})
windows_hacks(RoR)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
