diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2010-02-17 22:47:37 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2010-02-17 22:47:37 +0000 |
| commit | 17173cbae80eb7787aa61c9b8a290dc7ed6f2d6c (patch) | |
| tree | c44352187ada3752791fee8e414285999838f417 /cpp | |
| parent | 3add7d150984e7904acf0898cab8cb7941de27ba (diff) | |
| download | qpid-python-17173cbae80eb7787aa61c9b8a290dc7ed6f2d6c.tar.gz | |
Allow cmake build to work again with earlier boost versions
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@911207 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/CMakeLists.txt | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 77a45ec103..62bab239be 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -166,13 +166,14 @@ 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) +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 @@ if (NOT Boost_REGEX_LIBRARY) 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 |