Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-12 00:20:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Copy quazip lib to build dir; built server-console

Browse source
This commit is contained in:
Simon Walton 2019-11-21 15:02:08 -08:00
parent 51cf9fab8e
commit 9e5c0a7afc
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -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

10
cmake/macros/TargetQuazip.cmake
View file

@ -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()
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()

2
tools/ci-scripts/linux-gha/Dockerfile
View file

@ -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