Author: shuston
Date: Tue Dec 15 17:40:07 2009
New Revision: 890900
URL: http://svn.apache.org/viewvc?rev=890900&view=rev
Log:
Fix the check for boost system; prev one broke Windows config. Instead of
trying to find_library, run the Find_Boost again for just the system component
when needed. Resolving QPID-2202.
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=890900&r1=890899&r2=890900&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Tue Dec 15 17:40:07 2009
@@ -166,10 +166,11 @@
# 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)
- find_library(Boost_SYSTEM_LIBRARY boost_system ${Boost_LIBRARY_DIRS})
+ find_package(Boost COMPONENTS system)
if (NOT Boost_SYSTEM_LIBRARY)
- message(FATAL_ERROR "Boost.system library not found. Please install or
try setting BOOST_ROOT")
+ set(Boost_SYSTEM_LIBRARY boost_system)
endif (NOT Boost_SYSTEM_LIBRARY)
+
endif (NOT Boost_VERSION LESS 103500)
# Versions of cmake pre 2.6 don't set the Boost_*_LIBRARY variables correctly
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
