svn commit: r911207 - /qpid/trunk/qpid/cpp/src/CMakeLists.txt

[as...@apache.org]

Author: astitcher
Date: Wed Feb 17 22:47:37 2010
New Revision: 911207

URL: http://svn.apache.org/viewvc?rev=911207&view=rev
Log:
Allow cmake build to work again with earlier boost versions

Modified:
    qpid/trunk/qpid/cpp/src/CMakeLists.txt

Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=911207&r1=911206&r2=911207&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Wed Feb 17 22:47:37 2010
@@ -166,13 +166,14 @@
 
 # Boost.system was introduced at Boost 1.35; it's needed secondarily by other
 # Boost libs Qpid needs, so be sure it's there.
-if (NOT Boost_VERSION LESS 103500)
+if (Boost_VERSION GREATER 103499)
   find_package(Boost COMPONENTS system)
+
+  # Allow for cmake pre 2.6 and boost post 1.35
   if (NOT Boost_SYSTEM_LIBRARY)
     set(Boost_SYSTEM_LIBRARY boost_system)
   endif (NOT Boost_SYSTEM_LIBRARY)
-
-endif (NOT Boost_VERSION LESS 103500)
+endif (Boost_VERSION GREATER 103499)
 
 # Versions of cmake pre 2.6 don't set the Boost_*_LIBRARY variables correctly
 # these values are correct for Linux
@@ -192,10 +193,6 @@
   set(Boost_REGEX_LIBRARY boost_regex)
 endif (NOT Boost_REGEX_LIBRARY)
 
-if (NOT Boost_SYSTEM_LIBRARY)
-  set(Boost_SYSTEM_LIBRARY boost_system)
-endif (NOT Boost_SYSTEM_LIBRARY)
-
 # The Windows install also wants the Boost DLLs and headers that the release
 # is built with. The DLLs enable everything to run, and the headers ensure
 # that users building Qpid C++ client programs can compile (the C++ API



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org