Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:43:03 +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

2
CMakeLists.txt
View file

@ -274,10 +274,8 @@ endif()
if (BUILD_CLIENT OR BUILD_SERVER) if (BUILD_CLIENT OR BUILD_SERVER)
add_subdirectory(plugins) add_subdirectory(plugins)
if (NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND "$ENV{CI_BUILD}" STREQUAL "Github"))
add_subdirectory(server-console) add_subdirectory(server-console)
endif() endif()
endif()
# BUILD_TOOLS option will be handled inside the tools's CMakeLists.txt because 'scribe' tool is required for build anyway # BUILD_TOOLS option will be handled inside the tools's CMakeLists.txt because 'scribe' tool is required for build anyway
add_subdirectory(tools) add_subdirectory(tools)

8
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) find_library(QUAZIP_LIBRARY_DEBUG quazip5 PATHS ${VCPKG_INSTALL_ROOT}/debug/lib NO_DEFAULT_PATH)
select_library_configurations(QUAZIP) select_library_configurations(QUAZIP)
target_link_libraries(${TARGET_NAME} ${QUAZIP_LIBRARIES}) target_link_libraries(${TARGET_NAME} ${QUAZIP_LIBRARIES})
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() 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/ COPY ./plugins/pcmCodec/libpcmCodec.so /etc/hifi/server/plugins/
# Dummy statement # Dummy statement
RUN true RUN true
#COPY ./*.so /lib/ COPY ./*.so /lib/
RUN ln -sf /lib/libquazip5.so /lib/libquazip5.so.1 RUN ln -sf /lib/libquazip5.so /lib/libquazip5.so.1
#COPY ./resources/ /etc/hifi/server/resources/ #COPY ./resources/ /etc/hifi/server/resources/
#COPY ./supervisor/hifi.conf /etc/supervisor/conf.d/hifi.conf #COPY ./supervisor/hifi.conf /etc/supervisor/conf.d/hifi.conf