From 2868cefc53e10bc1231fb37c769169558d5f5db2 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Tue, 24 Oct 2023 13:19:16 -0400 Subject: [PATCH] build: fix missing xo deps --- cmake/websockConfig.cmake.in | 6 +++--- src/websock/CMakeLists.txt | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cmake/websockConfig.cmake.in b/cmake/websockConfig.cmake.in index ac43847f..a3dad29f 100644 --- a/cmake/websockConfig.cmake.in +++ b/cmake/websockConfig.cmake.in @@ -4,10 +4,10 @@ include(CMakeFindDependencyMacro) # note: changes to find_dependency() calls here # must coordinate with xo_dependency() calls -# in xo-reactor/src/reactor/CMakeLists.txt +# in xo-websock/src/websock/CMakeLists.txt # -#find_dependency(reflect) -#find_dependency(callback) +find_dependency(reactor) +find_dependency(webutil) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") check_required_components("@PROJECT_NAME@") diff --git a/src/websock/CMakeLists.txt b/src/websock/CMakeLists.txt index 42f37a7d..1071bf7f 100644 --- a/src/websock/CMakeLists.txt +++ b/src/websock/CMakeLists.txt @@ -8,6 +8,9 @@ xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 $ # ---------------------------------------------------------------- # external dependencies +# note: changes to xo_dependency() calls here +# must coordinate with find_dependency() calls in +# xo-websock/cmake/websockConfig.cmake.in xo_dependency(${SELF_LIB} reactor) xo_dependency(${SELF_LIB} webutil) @@ -15,7 +18,3 @@ xo_dependency(${SELF_LIB} webutil) xo_external_target_dependency(${SELF_LIB} Libwebsockets websockets_shared) # see jsoncpp-namespaced-targets.cmake (maybe?) for available targets xo_external_target_dependency(${SELF_LIB} jsoncpp jsoncpp_lib) - -# note: changes to xo_dependency() calls here -# must coordinate with find_dependency() calls in -# xo-websock/cmake/websockConfig.cmake.in