Author: gsim
Date: Tue Oct 15 16:05:54 2013
New Revision: 1532408
URL: http://svn.apache.org/r1532408
Log:
QPID-4582, QPID-5215: fix linking errors for clock_gettime
Modified:
qpid/trunk/qpid/cpp/src/legacystore.cmake
qpid/trunk/qpid/cpp/src/tests/legacystore/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/src/legacystore.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/legacystore.cmake?rev=1532408&r1=1532407&r2=1532408&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/legacystore.cmake (original)
+++ qpid/trunk/qpid/cpp/src/legacystore.cmake Tue Oct 15 16:05:54 2013
@@ -146,6 +146,7 @@ if (BUILD_LEGACYSTORE)
)
target_link_libraries (legacystore
+ ${clock_gettime_LIB}
aio
uuid
qpidcommon qpidtypes qpidbroker
@@ -165,6 +166,7 @@ if (BUILD_LEGACYSTORE)
)
target_link_libraries (legacystore_shared
+ ${clock_gettime_LIB}
aio
uuid
qpidcommon qpidtypes qpidbroker
Modified: qpid/trunk/qpid/cpp/src/tests/legacystore/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/legacystore/CMakeLists.txt?rev=1532408&r1=1532407&r2=1532408&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/legacystore/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/legacystore/CMakeLists.txt Tue Oct 15
16:05:54 2013
@@ -106,7 +106,7 @@ add_executable (${testname}
${platform_test_additions})
target_link_libraries (${testname}
${qpid_test_boost_libs}
- legacystore_shared)
+ ${clock_gettime_LIB} legacystore_shared)
if ("${ARGV1}" STREQUAL "LONG")
set_target_properties(${testname} PROPERTIES COMPILE_DEFINITIONS LONG_TEST)
endif ()
@@ -148,7 +148,7 @@ add_executable(jtt
target_link_libraries (jtt
${Boost_PROGRAM_OPTIONS_LIBRARY}
- legacystore_shared)
+ ${clock_gettime_LIB} legacystore_shared)
add_test(journal_jtt ${CMAKE_CURRENT_BINARY_DIR}/jtt -c
${CMAKE_CURRENT_SOURCE_DIR}/jrnl/jtt/jtt.csv)
@@ -175,7 +175,7 @@ add_executable (jtt__ut
target_link_libraries (jtt__ut
${qpid_test_boost_libs}
${Boost_PROGRAM_OPTIONS_LIBRARY}
- legacystore_shared)
+ ${clock_gettime_LIB} legacystore_shared)
add_test(NAME journal_jtt_ut WORKING_DIRECTORY
${CMAKE_CURRENT_SOURCE_DIR}/jrnl/jtt COMMAND
${CMAKE_CURRENT_BINARY_DIR}/jtt__ut)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
