From 9e5c0a7afc2fa817461b022402d61821c79bab92 Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Thu, 21 Nov 2019 15:02:08 -0800
Subject: [PATCH] Copy quazip lib to build dir; built server-console

---
 CMakeLists.txt                        |  4 +---
 cmake/macros/TargetQuazip.cmake       | 10 +++++++++-
 tools/ci-scripts/linux-gha/Dockerfile |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a18094e54..8b8faed73c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -274,9 +274,7 @@ endif()
 
 if (BUILD_CLIENT OR BUILD_SERVER)
   add_subdirectory(plugins)
-  if (NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND "$ENV{CI_BUILD}" STREQUAL "Github"))
-    add_subdirectory(server-console)
-  endif()
+  add_subdirectory(server-console)
 endif()
 
 # BUILD_TOOLS option will be handled inside the tools's CMakeLists.txt because 'scribe' tool is required for build anyway
diff --git a/cmake/macros/TargetQuazip.cmake b/cmake/macros/TargetQuazip.cmake
index ee57fb4af3..af89686ff6 100644
--- a/cmake/macros/TargetQuazip.cmake
+++ b/cmake/macros/TargetQuazip.cmake
@@ -10,4 +10,12 @@ macro(TARGET_QUAZIP)
   find_library(QUAZIP_LIBRARY_DEBUG quazip5 PATHS ${VCPKG_INSTALL_ROOT}/debug/lib NO_DEFAULT_PATH)
   select_library_configurations(QUAZIP)
   target_link_libraries(${TARGET_NAME} ${QUAZIP_LIBRARIES})
-endmacro()
\ No newline at end of file
+  if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+    add_custom_command(
+      TARGET ${TARGET_NAME}
+      POST_BUILD
+      COMMAND cp
+      ARGS -d ${QUAZIP_LIBRARIES}* ${CMAKE_BINARY_DIR}
+      )
+  endif()
+endmacro()
diff --git a/tools/ci-scripts/linux-gha/Dockerfile b/tools/ci-scripts/linux-gha/Dockerfile
index 4f8fe4f4e3..8a1ade1d58 100644
--- a/tools/ci-scripts/linux-gha/Dockerfile
+++ b/tools/ci-scripts/linux-gha/Dockerfile
@@ -14,7 +14,7 @@ COPY ./plugins/hifiCodec/libhifiCodec.so /etc/hifi/server/plugins/
 COPY ./plugins/pcmCodec/libpcmCodec.so /etc/hifi/server/plugins/
 # Dummy statement
 RUN true
-#COPY ./*.so /lib/
+COPY ./*.so /lib/
 RUN ln -sf /lib/libquazip5.so /lib/libquazip5.so.1
 #COPY ./resources/ /etc/hifi/server/resources/
 #COPY ./supervisor/hifi.conf /etc/supervisor/conf.d/hifi.conf