From d130454275aa68abfe6f3642de4486ea9b522641 Mon Sep 17 00:00:00 2001
From: Ned Wright <nedwright@proton.me>
Date: Sun, 22 Jan 2023 09:42:37 +0000
Subject: [PATCH] Fix installation issues

---
 core/encryptor/cpnano_base64/CMakeLists.txt | 9 +--------
 external/yq/CMakeLists.txt                  | 6 +-----
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/core/encryptor/cpnano_base64/CMakeLists.txt b/core/encryptor/cpnano_base64/CMakeLists.txt
index 1d4a0e6..c54eba8 100755
--- a/core/encryptor/cpnano_base64/CMakeLists.txt
+++ b/core/encryptor/cpnano_base64/CMakeLists.txt
@@ -2,12 +2,5 @@ add_executable(cpnano_base64 cpnano_base64.cc base64.cc)
 SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_COMPILE_FLAGS}")
 SET(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${GCC_LINK_FLAGS}")
 
-add_custom_command(TARGET cpnano_base64
-    POST_BUILD
-    COMMAND strip $<TARGET_FILE:cpnano_base64> -o $<TARGET_FILE:cpnano_base64>.strip
-    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:cpnano_base64>.strip ${CMAKE_INSTALL_PREFIX}/bin/$<TARGET_FILE:cpnano_json>.strip
-    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:cpnano_base64>.strip ${CMAKE_INSTALL_PREFIX}/orchestration/$<TARGET_FILE:cpnano_json>
-    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:cpnano_base64>.strip ${CMAKE_INSTALL_PREFIX}/wlp_standalone/$<TARGET_FILE:cpnano_json>
-)
-
 install(TARGETS cpnano_base64 DESTINATION bin/)
+install(TARGETS cpnano_base64 DESTINATION orchestration/)
diff --git a/external/yq/CMakeLists.txt b/external/yq/CMakeLists.txt
index 14300fd..9e55586 100755
--- a/external/yq/CMakeLists.txt
+++ b/external/yq/CMakeLists.txt
@@ -1,5 +1 @@
-file(
-    DOWNLOAD
-    https://github.com/mikefarah/yq/releases/download/v4.26.1/yq_linux_amd64
-    ${CMAKE_INSTALL_PREFIX}/orchestration/scripts/yq
-)
+install(FILES yq_linux_amd64 DESTINATION orchestration/scripts RENAME yq PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)