frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

set zlib back to system ignore list/revert pr #871 (#904)

Browse Source 
* set zlib to system ignore list
* undo pr #871
* exclude libcec if Dispmanx available
This commit is contained in:
Paulchen Panther 2020-07-27 19:10:32 +02:00 committed by GitHub
parent 374945346a
commit 773b47bf53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cmake/Dependencies.cmake
View File

@ -24,8 +24,13 @@ macro(DeployUnix TARGET)
"libusb-1" "libusb-1"
"libutil" "libutil"
"libX11" "libX11"
"libz"
) )
if(ENABLE_DISPMANX)
list(APPEND SYSTEM_LIBS_SKIP "libcec")
endif()
if (APPLE) if (APPLE)
set(OPENSSL_ROOT_DIR /usr/local/opt/openssl) set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)
endif(APPLE) endif(APPLE)
@ -153,35 +158,14 @@ macro(DeployUnix TARGET)
endif() endif()
# Pack Python modules to pythonXX.zip or copy to 'share/hyperion/lib/python' # Copy Python modules to 'share/hyperion/lib/python'
if (PYTHON_MODULES_DIR) if (PYTHON_MODULES_DIR)
# Since version 3.3.2 CMake has the functionality to generate a zip file built-in.
if (NOT CMAKE_VERSION VERSION_LESS "3.3.2")
file(GLOB PYTHON_MODULE_FILES RELATIVE "${PYTHON_MODULES_DIR}" "${PYTHON_MODULES_DIR}/*") install(
set(PYTHON_ZIP "python${PYTHON_VERSION_MAJOR_MINOR}.zip") DIRECTORY ${PYTHON_MODULES_DIR}/
DESTINATION "share/hyperion/lib/python"
execute_process( COMPONENT "Hyperion"
COMMAND "${CMAKE_COMMAND}" "-E" "tar" "cf" "${CMAKE_BINARY_DIR}/${PYTHON_ZIP}" "--format=zip" ${PYTHON_MODULE_FILES} )
WORKING_DIRECTORY "${PYTHON_MODULES_DIR}"
OUTPUT_QUIET
)
install(
FILES "${CMAKE_BINARY_DIR}/${PYTHON_ZIP}"
DESTINATION "share/hyperion/bin"
COMPONENT "Hyperion"
)
else()
install(
DIRECTORY ${PYTHON_MODULES_DIR}/
DESTINATION "share/hyperion/lib/python"
COMPONENT "Hyperion"
)
endif()
endif(PYTHON_MODULES_DIR) endif(PYTHON_MODULES_DIR)