[Gearbox-commit] SF.net SVN: gearbox:[496] gearbox/trunk/src

[<gb...@us...>]

Revision: 496
          http://gearbox.svn.sourceforge.net/gearbox/?rev=496&view=rev
Author:   gbiggs
Date:     2010-05-13 08:08:36 +0000 (Thu, 13 May 2010)

Log Message:
-----------
Applied patch from David Lobato to correct version checking

Modified Paths:
--------------
    gearbox/trunk/src/flexiport/python/CMakeLists.txt
    gearbox/trunk/src/hokuyo_aist/python/CMakeLists.txt

Modified: gearbox/trunk/src/flexiport/python/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/flexiport/python/CMakeLists.txt	2010-05-10 03:42:28 UTC (rev 495)
+++ gearbox/trunk/src/flexiport/python/CMakeLists.txt	2010-05-13 08:08:36 UTC (rev 496)
@@ -5,8 +5,8 @@
 endif(NOT PYTHON_LIBRARIES)
 
 # Find Boost::Python
-# There is a new, much better, FindBoost.cmake in 2.6
-if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
+# There is a new, much better, FindBoost.cmake since 2.6
+if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
 	OPTION (Boost_USE_STATIC_LIBS "Use the static versions of the Boost libraries" OFF)
 	MARK_AS_ADVANCED (Boost_USE_STATIC_LIBS)
 
@@ -28,7 +28,7 @@
 		MESSAGE (STATUS
 				"Boost libraries were not found. Cannot build Python bindings for Flexiport.")
 	endif(Boost_FOUND)
-else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
+else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
 	FIND_PACKAGE (Boost)
 	if(Boost_FOUND)
 		# For 2.4, assume that if boost is found then boost::python is present
@@ -48,7 +48,7 @@
 		MESSAGE (STATUS
 				"Boost libraries were not found. Cannot build Python bindings for Flexiport.")
 	endif(Boost_FOUND)
-endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
+endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
 
 if(PYTHON_LIBRARIES AND Boost_FOUND AND GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
 	MESSAGE (STATUS "Flexiport Python bindings will be built.")

Modified: gearbox/trunk/src/hokuyo_aist/python/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/hokuyo_aist/python/CMakeLists.txt	2010-05-10 03:42:28 UTC (rev 495)
+++ gearbox/trunk/src/hokuyo_aist/python/CMakeLists.txt	2010-05-13 08:08:36 UTC (rev 496)
@@ -5,8 +5,8 @@
 endif(NOT PYTHON_LIBRARIES)
 
 # Find Boost::Python
-# There is a new, much better, FindBoost.cmake in 2.6
-if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
+# There is a new, much better, FindBoost.cmake since 2.6
+if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
 	OPTION (Boost_USE_STATIC_LIBS "Use the static versions of the Boost libraries" OFF)
 	MARK_AS_ADVANCED (Boost_USE_STATIC_LIBS)
 
@@ -28,7 +28,7 @@
 		MESSAGE (STATUS
 				"Boost libraries were not found. Cannot build Python bindings for Hokuyo_aist.")
 	endif(Boost_FOUND)
-else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
+else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
 	FIND_PACKAGE (Boost)
 	if(Boost_FOUND)
 		# For 2.4, assume that if boost is found then boost::python is present
@@ -48,7 +48,7 @@
 		MESSAGE (STATUS
 				"Boost libraries were not found. Cannot build Python bindings for Hokuyo_aist.")
 	endif(Boost_FOUND)
-endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
+endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
 
 if(PYTHON_LIBRARIES AND Boost_FOUND AND GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
 	MESSAGE (STATUS "Hokuyo_aist Python bindings will be built.")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.