Commit: 8a0b0a2dd1867b8f8229e5a550c84d17730be1cc - HotshotOgreIOS (hg)

Commit MetaInfo

• Revision: 8a0b0a2dd1867b8f8229e5a550c84d17730be1cc (tree)
• Time: 2010-03-01 05:57:00
• Author: Steve Streeting <steve@stev...>
• Commiter: Steve Streeting

Log Message

Merged v9841 into tag since urgent change

Change Summary

• modified: CMake/Utils/OgreGetVersion.cmake
• modified: Components/Paging/CMakeLists.txt
• modified: Components/Property/CMakeLists.txt
• modified: Components/RTShaderSystem/CMakeLists.txt
• modified: Components/Terrain/CMakeLists.txt
• modified: OgreMain/CMakeLists.txt

Incremental Difference

diff -r 92320b6ddc02 -r 8a0b0a2dd186 CMake/Utils/OgreGetVersion.cmake
--- a/CMake/Utils/OgreGetVersion.cmake	Sun Feb 28 16:51:14 2010 +0000
+++ b/CMake/Utils/OgreGetVersion.cmake	Sun Feb 28 20:57:00 2010 +0000
@@ -17,6 +17,7 @@
   get_preprocessor_entry(TEMP_VAR_CONTENTS OGRE_VERSION_NAME OGRE_VERSION_NAME)
   get_preprocessor_entry(TEMP_VAR_CONTENTS OGRE_VERSION_SUFFIX OGRE_VERSION_SUFFIX)
   set(OGRE_VERSION "${OGRE_VERSION_MAJOR}.${OGRE_VERSION_MINOR}.${OGRE_VERSION_PATCH} ${OGRE_VERSION_SUFFIX}")
+  set(OGRE_SOVERSION "${OGRE_VERSION_MAJOR}.${OGRE_VERSION_MINOR}.${OGRE_VERSION_PATCH}")
   set(OGRE_VERSION_DASH_SEPARATED "${OGRE_VERSION_MAJOR}-${OGRE_VERSION_MINOR}-${OGRE_VERSION_PATCH}${OGRE_VERSION_SUFFIX}")
 
 endmacro()

diff -r 92320b6ddc02 -r 8a0b0a2dd186 Components/Paging/CMakeLists.txt
--- a/Components/Paging/CMakeLists.txt	Sun Feb 28 16:51:14 2010 +0000
+++ b/Components/Paging/CMakeLists.txt	Sun Feb 28 20:57:00 2010 +0000
@@ -53,7 +53,7 @@
 
 # setup target
 add_library(OgrePaging ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES})
-set_target_properties(OgrePaging PROPERTIES VERSION ${OGRE_VERSION})
+set_target_properties(OgrePaging PROPERTIES VERSION ${OGRE_SOVERSION})
 target_link_libraries(OgrePaging OgreMain)
 if (OGRE_CONFIG_THREADS)
   target_link_libraries(OgrePaging ${Boost_LIBRARIES})

diff -r 92320b6ddc02 -r 8a0b0a2dd186 Components/Property/CMakeLists.txt
--- a/Components/Property/CMakeLists.txt	Sun Feb 28 16:51:14 2010 +0000
+++ b/Components/Property/CMakeLists.txt	Sun Feb 28 20:57:00 2010 +0000
@@ -34,7 +34,7 @@
 
 # setup target
 add_library(OgreProperty ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES})
-set_target_properties(OgreProperty PROPERTIES VERSION ${OGRE_VERSION})
+set_target_properties(OgreProperty PROPERTIES VERSION ${OGRE_SOVERSION})
 target_link_libraries(OgreProperty OgreMain)
 if (OGRE_CONFIG_THREADS)
   target_link_libraries(OgreProperty ${Boost_LIBRARIES})

diff -r 92320b6ddc02 -r 8a0b0a2dd186 Components/RTShaderSystem/CMakeLists.txt
--- a/Components/RTShaderSystem/CMakeLists.txt	Sun Feb 28 16:51:14 2010 +0000
+++ b/Components/RTShaderSystem/CMakeLists.txt	Sun Feb 28 20:57:00 2010 +0000
@@ -81,7 +81,7 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 add_library(OgreRTShaderSystem ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES})
-set_target_properties(OgreRTShaderSystem PROPERTIES VERSION ${OGRE_VERSION})
+set_target_properties(OgreRTShaderSystem PROPERTIES VERSION ${OGRE_SOVERSION})
 target_link_libraries(OgreRTShaderSystem OgreMain)
 
 ogre_config_component(OgreRTShaderSystem)

diff -r 92320b6ddc02 -r 8a0b0a2dd186 Components/Terrain/CMakeLists.txt
--- a/Components/Terrain/CMakeLists.txt	Sun Feb 28 16:51:14 2010 +0000
+++ b/Components/Terrain/CMakeLists.txt	Sun Feb 28 20:57:00 2010 +0000
@@ -55,7 +55,7 @@
 
 # setup target
 add_library(OgreTerrain ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES})
-set_target_properties(OgreTerrain PROPERTIES VERSION ${OGRE_VERSION})
+set_target_properties(OgreTerrain PROPERTIES VERSION ${OGRE_SOVERSION})
 target_link_libraries(OgreTerrain OgreMain)
 if (OGRE_BUILD_COMPONENT_PAGING)
 	target_link_libraries(OgreTerrain OgrePaging)

diff -r 92320b6ddc02 -r 8a0b0a2dd186 OgreMain/CMakeLists.txt
--- a/OgreMain/CMakeLists.txt	Sun Feb 28 16:51:14 2010 +0000
+++ b/OgreMain/CMakeLists.txt	Sun Feb 28 20:57:00 2010 +0000
@@ -637,7 +637,7 @@
 
 # setup OgreMain target
 add_library(OgreMain ${OGRE_LIB_TYPE} ${PREC_HEADER} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES} ${THREAD_HEADER_FILES} ${THREAD_SOURCE_FILES})
-set_target_properties(OgreMain PROPERTIES VERSION ${OGRE_VERSION})
+set_target_properties(OgreMain PROPERTIES VERSION ${OGRE_SOVERSION})
 if (APPLE)
   if (NOT OGRE_BUILD_PLATFORM_IPHONE)
     set_target_properties(OgreMain PROPERTIES FRAMEWORK TRUE)