[ogre] Remove WIN32 limitation

Bruno Wolff III bruno at fedoraproject.org
Sat Aug 11 18:26:49 UTC 2012


commit 4fa1d8007df34893f05d140f73bc547e930536e0
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sat Aug 11 13:25:38 2012 -0500

    Remove WIN32 limitation
    
    For some reason the upstream patch limited the affects to WIN32 builds,
    when it really should be suitable for any OS using boost.

 ogre-boost_cmake.patch |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/ogre-boost_cmake.patch b/ogre-boost_cmake.patch
index ffa15fe..3b7442b 100644
--- a/ogre-boost_cmake.patch
+++ b/ogre-boost_cmake.patch
@@ -5,7 +5,7 @@ diff -r 913dc0cabd9b CMake/Dependencies.cmake
  	endif()
  	find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
  endif()
-+if (Boost_FOUND AND WIN32)
++if (Boost_FOUND)
 +	if(Boost_VERSION GREATER 104700)
 +		set(OGRE_BOOST_COMPONENTS thread date_time system)
 +	endif()
@@ -19,7 +19,7 @@ diff -r 913dc0cabd9b CMake/Dependencies.cmake
  macro_log_feature(Boost_FOUND "boost" "Boost (general)" "http://boost.org" FALSE "" "")
  macro_log_feature(Boost_THREAD_FOUND "boost-thread" "Used for threading support" "http://boost.org" FALSE "" "")
  macro_log_feature(Boost_DATE_TIME_FOUND "boost-date_time" "Used for threading support" "http://boost.org" FALSE "" "")
-+if (Boost_FOUND AND WIN32)
++if (Boost_FOUND)
 +	if(Boost_VERSION GREATER 104700)
 +		macro_log_feature(Boost_SYSTEM_FOUND "boost-system" "Used for threading support" "http://boost.org" FALSE "" "")
 +	endif()
@@ -65,7 +65,7 @@ diff -r 913dc0cabd9b CMake/Templates/SDK_CMakeLists.txt.in
  		set(Boost_USE_STATIC_LIBS NOT ${Boost_USE_STATIC_LIBS})
  		find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
  	endif()
-+	if (Boost_FOUND AND WIN32)
++	if (Boost_FOUND)
 +		if(Boost_VERSION GREATER 104700)
 +			set(OGRE_BOOST_COMPONENTS thread date_time system)
 +		endif()
@@ -90,7 +90,7 @@ diff -r 913dc0cabd9b CMake/Templates/SDK_CMakeLists.txt.in
  		set(Boost_USE_STATIC_LIBS NOT ${Boost_USE_STATIC_LIBS})
  		find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
  	endif()
-+	if (Boost_FOUND AND WIN32)
++	if (Boost_FOUND)
 +		if(Boost_VERSION GREATER 104700)
 +			set(OGRE_BOOST_COMPONENTS thread date_time system)
 +		endif()


More information about the scm-commits mailing list