diff options
| author | Ted Ross <tross@apache.org> | 2011-05-18 02:14:07 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2011-05-18 02:14:07 +0000 |
| commit | 0bab2f6cf49bbfc2db1089fc25d339315e92f2c1 (patch) | |
| tree | 7dbac72712fcf450c394b116ed25ac13c863a802 /qpid/cpp/src/CMakeLists.txt | |
| parent | ecf0094069b8436259d0d723ce80700337a1b424 (diff) | |
| download | qpid-python-0bab2f6cf49bbfc2db1089fc25d339315e92f2c1.tar.gz | |
QPID-2905 - Code modifications to enable Windows builds with the mingw32 compiler.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1104662 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/CMakeLists.txt')
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index d0ca2d9c2b..0fe2d7e4d0 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -636,8 +636,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows) ) set (qpidcommon_platform_LIBS - ${windows_ssl_libs} ws2_32 - ) + ${Boost_THREAD_LIBRARY} ${windows_ssl_libs} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_DATE_TIME_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ws2_32 ) set (qpidbroker_platform_SOURCES qpid/broker/windows/BrokerDefaults.cpp qpid/broker/windows/SaslAuthenticator.cpp @@ -938,7 +937,7 @@ if (NOT QPID_GENERATED_HEADERS_IN_SOURCE) endif (NOT QPID_GENERATED_HEADERS_IN_SOURCE) -if (WIN32) +if (_MSC_VER) # Install the DtcPlugin project and call it qpidxarm. set(AMQP_WCF_DIR ${qpid-cpp_SOURCE_DIR}/../wcf) set(qpidxarm_SOURCES ${AMQP_WCF_DIR}/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp) @@ -951,7 +950,7 @@ if (WIN32) COMPONENT ${QPID_COMPONENT_CLIENT}) install_pdb (qpidxarm ${QPID_COMPONENT_CLIENT}) endif (EXISTS ${qpidxarm_SOURCES}) -endif (WIN32) +endif (_MSC_VER) set (qpidbroker_SOURCES ${mgen_broker_cpp} |