diff options
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | qpid/cpp/src/Makefile.am | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index c5bf627fc6..a2789e2b51 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -308,7 +308,7 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILER_FLAGS} ${WARNING_FLAGS}") if (CMAKE_SYSTEM_NAME STREQUAL Windows) set (Boost_components filesystem program_options date_time thread unit_test_framework regex) else (CMAKE_SYSTEM_NAME STREQUAL Windows) - set (Boost_components filesystem program_options unit_test_framework) + set (Boost_components program_options unit_test_framework) endif (CMAKE_SYSTEM_NAME STREQUAL Windows) # Visual Studio 2010 requires boost 1.45 or better. @@ -872,7 +872,6 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows) ) set (qpidcommon_platform_LIBS ${Boost_PROGRAM_OPTIONS_LIBRARY} - ${Boost_FILESYSTEM_LIBRARY} ${CMAKE_DL_LIBS} ) @@ -1253,8 +1252,7 @@ set (qpidd_SOURCES ) add_msvc_version (qpidd application exe) add_executable (qpidd ${qpidd_SOURCES}) -target_link_libraries (qpidd qpidbroker qpidcommon ${Boost_PROGRAM_OPTIONS_LIBRARY} - ${Boost_FILESYSTEM_LIBRARY}) +target_link_libraries (qpidd qpidbroker qpidcommon ${Boost_PROGRAM_OPTIONS_LIBRARY}) set_target_properties (qpidd PROPERTIES COMPILE_DEFINITIONS _IN_QPID_BROKER) install (TARGETS qpidd RUNTIME DESTINATION ${QPID_INSTALL_SBINDIR} diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am index 690616853f..19a1f3dbe5 100644 --- a/qpid/cpp/src/Makefile.am +++ b/qpid/cpp/src/Makefile.am @@ -337,7 +337,6 @@ EXTRA_DIST +=\ libqpidcommon_la_LIBADD = \ libqpidtypes.la \ -lboost_program_options \ - -lboost_filesystem \ -luuid \ -lpthread \ $(LIB_DLOPEN) \ |