53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
--- qpid-proton-0.38.0/cpp/CMakeLists.txt 2024-03-27 09:19:01.190206114 +0100
|
|
+++ qpid-proton-0.38.0/cpp/CMakeLists.txt 2024-03-27 09:58:05.402371516 +0100
|
|
@@ -59,6 +59,7 @@
|
|
"${PN_C_INCLUDE_DIR}"
|
|
"${CMAKE_CURRENT_BINARY_DIR}"
|
|
)
|
|
+link_directories("${CMAKE_BINARY_DIR}/c")
|
|
|
|
add_definitions(${CXX_STANDARD} ${CXX_WARNING_FLAGS} "-DPN_CPP_USE_DEPRECATED_API=1")
|
|
|
|
--- qpid-proton-0.38.0/cpp/examples/CMakeLists.txt 2024-03-27 09:19:01.196872826 +0100
|
|
+++ qpid-proton-0.38.0/cpp/examples/CMakeLists.txt 2024-03-27 09:50:10.489229529 +0100
|
|
@@ -79,7 +79,7 @@
|
|
scheduled_send
|
|
service_bus)
|
|
add_executable(${example} ${example}.cpp)
|
|
- target_link_libraries(${example} Proton::cpp)
|
|
+ target_link_libraries(${example} Proton::cpp qpid-proton-core qpid-proton-proactor)
|
|
endforeach()
|
|
|
|
# Tracing examples
|
|
@@ -97,5 +97,5 @@
|
|
multithreaded_client
|
|
multithreaded_client_flow_control)
|
|
add_executable(${example} ${example}.cpp)
|
|
- target_link_libraries(${example} Proton::cpp Threads::Threads)
|
|
+ target_link_libraries(${example} Proton::cpp Threads::Threads qpid-proton-core qpid-proton-proactor)
|
|
endforeach()
|
|
--- qpid-proton-0.38.0/cpp/tests.cmake 2024-03-27 09:19:01.190206114 +0100
|
|
+++ qpid-proton-0.38.0/cpp/tests.cmake 2024-03-27 09:39:56.201833370 +0100
|
|
@@ -41,7 +41,7 @@
|
|
|
|
macro(add_cpp_test test)
|
|
add_executable (${test} src/${test}.cpp)
|
|
- target_link_libraries (${test} qpid-proton-cpp ${PLATFORM_LIBS})
|
|
+ target_link_libraries (${test} qpid-proton-cpp qpid-proton-core qpid-proton-proactor ${PLATFORM_LIBS})
|
|
pn_add_test(
|
|
EXECUTABLE
|
|
NAME cpp-${test}
|
|
@@ -82,10 +82,10 @@
|
|
|
|
include_directories(${CMAKE_SOURCE_DIR}/tests/include)
|
|
add_executable(cpp-test src/cpp-test.cpp src/url_test.cpp)
|
|
-target_link_libraries(cpp-test qpid-proton-cpp ${PLATFORM_LIBS})
|
|
+target_link_libraries(cpp-test qpid-proton-cpp qpid-proton-core qpid-proton-proactor ${PLATFORM_LIBS})
|
|
# tests that require access to pn_ functions in qpid-proton-core
|
|
add_executable(cpp-core-test src/cpp-test.cpp src/object_test.cpp)
|
|
-target_link_libraries(cpp-core-test qpid-proton-cpp qpid-proton-core ${PLATFORM_LIBS})
|
|
+target_link_libraries(cpp-core-test qpid-proton-cpp qpid-proton-core qpid-proton-proactor ${PLATFORM_LIBS})
|
|
|
|
macro(add_catch_test tag)
|
|
pn_add_test(
|