qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r889358 - in /qpid/trunk/qpid/cpp/src: CMakeLists.txt cluster.cmake tests/cluster.cmake
Date Thu, 10 Dec 2009 18:40:37 GMT
Author: aconway
Date: Thu Dec 10 18:40:37 2009
New Revision: 889358

URL: http://svn.apache.org/viewvc?rev=889358&view=rev
Log:
QPID-2236: cmake link error, missing boost.system library.

Tested on boost-1.37.0-7.fc11.x86_64 which has the system library and
boost-1.33.1-10.el5 which does not.

Modified:
    qpid/trunk/qpid/cpp/src/CMakeLists.txt
    qpid/trunk/qpid/cpp/src/cluster.cmake
    qpid/trunk/qpid/cpp/src/tests/cluster.cmake

Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=889358&r1=889357&r2=889358&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Thu Dec 10 18:40:37 2009
@@ -157,7 +157,7 @@
 # (which itself uses regex).
 find_package(Boost 1.33 REQUIRED
              COMPONENTS filesystem program_options date_time thread
-                        regex unit_test_framework)
+                        regex unit_test_framework system)
 if(NOT Boost_FOUND)
   message(FATAL_ERROR "Boost C++ libraries not found.  Please install or try setting BOOST_ROOT")
 endif(NOT Boost_FOUND)
@@ -180,6 +180,14 @@
   set(Boost_REGEX_LIBRARY boost_regex)
 endif (NOT Boost_REGEX_LIBRARY)
 
+if (NOT Boost_SYSTEM_LIBRARY)
+  # This library is not present in earlier boost versions so check for presence.
+  find_library(LIBBOOST_SYSTEM, boost_system ${Boost_LIBRARY_DIRS})
+  if (LIBBOOST_SYSTEM)
+    set(Boost_SYSTEM_LIBRARY boost_system)
+  endif (LIBBOOST_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

Modified: qpid/trunk/qpid/cpp/src/cluster.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/cluster.cmake?rev=889358&r1=889357&r2=889358&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/cluster.cmake (original)
+++ qpid/trunk/qpid/cpp/src/cluster.cmake Thu Dec 10 18:40:37 2009
@@ -133,7 +133,7 @@
       )
 
   add_library (cluster MODULE ${cluster_SOURCES})
-  target_link_libraries (cluster ${LIBCPG} ${CMAN_LIB} qpidbroker qpidclient ${Boost_FILESYSTEM_LIBRARY})
+  target_link_libraries (cluster ${LIBCPG} ${CMAN_LIB} qpidbroker qpidclient ${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY})
   set_target_properties (cluster PROPERTIES PREFIX "")
   
   # Create a second shared library for linking with test executables,

Modified: qpid/trunk/qpid/cpp/src/tests/cluster.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/cluster.cmake?rev=889358&r1=889357&r2=889358&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/cluster.cmake (original)
+++ qpid/trunk/qpid/cpp/src/tests/cluster.cmake Thu Dec 10 18:40:37 2009
@@ -35,7 +35,7 @@
   InitialStatusMap
   StoreStatus
   )
-add_executable (cluster_test cluster_test ${cluster_test_SOURCES}  ${platform_test_additions})
+add_executable (cluster_test ${cluster_test_SOURCES}  ${platform_test_additions})
 target_link_libraries (cluster_test ${qpid_test_boost_libs} qpidclient qpidbroker cluster_shared)
 remember_location(cluster_test)
 



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


Mime
View raw message