diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-10-01 19:14:19 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-10-01 19:14:19 +0000 |
| commit | 94fafea170804ebfa07a914f3bd1957f13c525a9 (patch) | |
| tree | da485279f5b0092ed02d4f64a5755f5cff26cf38 /qpid | |
| parent | f2d1adc5cac45dd39a9e6eb74ddc446e4b2075ea (diff) | |
| download | qpid-python-94fafea170804ebfa07a914f3bd1957f13c525a9.tar.gz | |
QPID-5176: Simplify CMake specification now that we don't need to compile
different files in qpidmessaging differently. This also avoids some Visual
Studio 2008 breakage.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1528184 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 45b93cd358..cde80194df 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -1195,8 +1195,7 @@ install (DIRECTORY ../include/qpid PATTERN ".svn" EXCLUDE) install_pdb (qpidclient ${QPID_COMPONENT_CLIENT}) -set (qpidmessaging_SOURCES_hidden - qpid/messaging/AddressParser.h +set (qpidmessaging_SOURCES qpid/messaging/AddressImpl.h qpid/messaging/ConnectionImpl.h qpid/messaging/ReceiverImpl.h @@ -1220,15 +1219,8 @@ set (qpidmessaging_SOURCES_hidden qpid/client/amqp0_10/SessionImpl.cpp qpid/client/amqp0_10/SenderImpl.h qpid/client/amqp0_10/SenderImpl.cpp -) -set_source_files_properties( - ${qpidmessaging_SOURCES_hidden} - PROPERTIES - COMPILE_FLAGS "${HIDE_SYMBOL_FLAGS}") - -set (qpidmessaging_SOURCES - ${qpidmessaging_SOURCES_hidden} qpid/messaging/Address.cpp + qpid/messaging/AddressParser.h qpid/messaging/AddressParser.cpp # The functions in here are not in the public interface, but qmf uses them qpid/messaging/Connection.cpp qpid/messaging/Duration.cpp @@ -1247,10 +1239,6 @@ set (qpidmessaging_SOURCES qpid/messaging/amqp/EncodedMessage.h qpid/messaging/amqp/EncodedMessage.cpp ) -set_source_files_properties( - ${qpidmessaging_SOURCES} - PROPERTIES - COMPILE_FLAGS "${HIDE_SYMBOL_FLAGS}") add_msvc_version (qpidmessaging library dll) @@ -1258,6 +1246,7 @@ add_library (qpidmessaging SHARED ${qpidmessaging_SOURCES}) target_link_libraries (qpidmessaging qpidtypes qpidclient qpidcommon) set_target_properties (qpidmessaging PROPERTIES LINK_FLAGS "${HIDE_SYMBOL_FLAGS} ${LINK_VERSION_SCRIPT_FLAG}" + COMPILE_FLAGS "${HIDE_SYMBOL_FLAGS}" VERSION ${qpidmessaging_version} SOVERSION ${qpidmessaging_version_major}) install (TARGETS qpidmessaging |