Author: astitcher
Date: Thu Dec 20 17:48:45 2012
New Revision: 1424608
URL: http://svn.apache.org/viewvc?rev=1424608&view=rev
Log:
NO-JIRA: Stop linking boost filesystem library in Posix port as it isn't used
anymore
(yay!)
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/Makefile.am
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1424608&r1=1424607&r2=1424608&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Thu Dec 20 17:48:45 2012
@@ -308,7 +308,7 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_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}
Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=1424608&r1=1424607&r2=1424608&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Thu Dec 20 17:48:45 2012
@@ -337,7 +337,6 @@ EXTRA_DIST +=\
libqpidcommon_la_LIBADD = \
libqpidtypes.la \
-lboost_program_options \
- -lboost_filesystem \
-luuid \
-lpthread \
$(LIB_DLOPEN) \
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
