diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-12-15 17:40:07 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-12-15 17:40:07 +0000 |
| commit | a66973a94f41bc034d98d39028e13cbbff805b93 (patch) | |
| tree | 67eac24da1ef809f4a2b36c32b4f0d13e0ad3e25 /cpp | |
| parent | fed2f28574fe4ce34de0ec674914416ba16f2956 (diff) | |
| download | qpid-python-a66973a94f41bc034d98d39028e13cbbff805b93.tar.gz | |
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.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@890900 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 8de4e01e6e..b7d96ba273 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -166,10 +166,11 @@ endif(NOT Boost_FOUND) # 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 |