summaryrefslogtreecommitdiff
path: root/qpid
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-06-14 20:02:39 +0000
committerAlan Conway <aconway@apache.org>2012-06-14 20:02:39 +0000
commit0c8ef48c819844bb921ff33ca5196a5705757f7e (patch)
tree30f4039415ba236cf1d8436e2e27606b01403eba /qpid
parent03118b75fbacc5bd951a313bcce8f74b38fc6236 (diff)
downloadqpid-python-0c8ef48c819844bb921ff33ca5196a5705757f7e.tar.gz
NO-JIRA: CMakeLists.txt: moved reference to pthread from HA link list to linux specific section.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1350381 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
-rw-r--r--qpid/cpp/src/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt
index 23a55845ce..e7090b74a0 100644
--- a/qpid/cpp/src/CMakeLists.txt
+++ b/qpid/cpp/src/CMakeLists.txt
@@ -661,7 +661,7 @@ if (BUILD_HA)
add_library (ha MODULE ${ha_SOURCES})
set_target_properties (ha PROPERTIES PREFIX "")
- target_link_libraries (ha qpidcommon qpidbroker pthread ${Boost_PROGRAM_OPTIONS_LIBRARY})
+ target_link_libraries (ha qpidtypes qpidcommon qpidbroker)
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties (ha PROPERTIES
PREFIX ""
@@ -806,6 +806,7 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows)
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
if (CMAKE_COMPILER_IS_GNUCXX)
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GCC_CATCH_UNDEFINED} -pthread")
+ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread")
endif (CMAKE_COMPILER_IS_GNUCXX)
# On Linux override memory status module
set (qpid_memstat_module