From 9d848264f39d4fcd074fbac0b08c2bc9683b842d Mon Sep 17 00:00:00 2001 From: Ned Wright Date: Wed, 13 Dec 2023 17:23:43 +0000 Subject: [PATCH] Updating library finding --- core/CMakeLists.txt | 2 +- nodes/orchestration/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 2b7d2de..73caf65 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(cptest) +#add_subdirectory(cptest) add_subdirectory(agent_core_utilities) add_subdirectory(shell_cmd) add_subdirectory(debug_is) diff --git a/nodes/orchestration/CMakeLists.txt b/nodes/orchestration/CMakeLists.txt index 8f8e671..f2aea56 100755 --- a/nodes/orchestration/CMakeLists.txt +++ b/nodes/orchestration/CMakeLists.txt @@ -97,7 +97,7 @@ execute_process ( install(FILES ${boost_thread} DESTINATION orchestration/lib/boost) execute_process ( - COMMAND sh -c "find /usr/lib* -name \"libcrypto.so\" | awk '{printf $0\";\"}'" + COMMAND sh -c "find /usr/lib* -maxdepth 1 -name \"libcrypto.so*\" | awk '{printf $0\";\"}'" OUTPUT_VARIABLE crypto ) install(FILES ${crypto} DESTINATION orchestration/lib) @@ -108,7 +108,7 @@ execute_process ( install(FILES ${crypto2} DESTINATION orchestration/lib) execute_process ( - COMMAND sh -c "find /usr/lib* -name \"libssl.so\" | awk '{printf $1\";\"}'" + COMMAND sh -c "find /usr/lib* -maxdepth 1 -name \"libssl.so*\" | awk '{printf $1\";\"}'" OUTPUT_VARIABLE ssl ) install(FILES ${ssl} DESTINATION orchestration/lib)