diff options
| author | Stephen D. Huston <shuston@apache.org> | 2013-06-21 01:55:19 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2013-06-21 01:55:19 +0000 |
| commit | 08a1ae9c049d1faf75608e9a2ef43024653e304b (patch) | |
| tree | 1144ab43cc09ce674f5ca176a53d0117d3620314 /qpid/cpp/src | |
| parent | 6d9b6d39ee9973cddb9fa3b76ffc0c856ad5e5cb (diff) | |
| download | qpid-python-08a1ae9c049d1faf75608e9a2ef43024653e304b.tar.gz | |
Fix broken Windows configure; QPID-4938 change 19-June-2013 broke it.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1495271 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 7690404f24..48279a2aed 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -1060,13 +1060,17 @@ add_library (qpidcommon SHARED ${qpidcommon_SOURCES}) if (CLOCK_GETTIME_IN_RT) set (qpidcommon_platform_LIBS ${qpidcommon_platform_LIBS} rt) endif (CLOCK_GETTIME_IN_RT) +# Not all platforms have NSS_LINK_FLAGS +if (NSS_LINK_FLAGS) + set (qpidcommon_LINK_FLAGS LINK_FLAGS ${NSS_LINK_FLAGS}) +endif (NSS_LINK_FLAGS) target_link_libraries (qpidcommon qpidtypes ${qpidcommon_platform_LIBS} ${qpidcommon_sasl_lib}) set_target_properties (qpidcommon PROPERTIES VERSION ${qpidcommon_version} SOVERSION ${qpidcommon_version_major} - LINK_FLAGS ${NSS_LINK_FLAGS}) + ${qpidcommon_LINK_FLAGS}) install (TARGETS qpidcommon DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_COMMON}) |