Author: shuston Date: Fri Jun 21 01:55:19 2013 New Revision: 1495271 URL: http://svn.apache.org/r1495271 Log: Fix broken Windows configure; QPID-4938 change 19-June-2013 broke it.
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1495271&r1=1495270&r2=1495271&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original) +++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Fri Jun 21 01:55:19 2013 @@ -1060,13 +1060,17 @@ add_library (qpidcommon SHARED ${qpidcom 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}) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org