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

Resolved SSL/Avahi problem in Packages (#689)

Browse Source 
Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com>
This commit is contained in:
Paulchen Panther 2020-02-19 17:27:25 +01:00 committed by GitHub
parent 2e15ef7c82
commit b5c74a84c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hyperiond/CMakeLists.txt
View File

@ -5,8 +5,6 @@ include_directories(${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}/..)
macro(InstallDependencies TARGET INSTALL_COMPONENT) macro(InstallDependencies TARGET INSTALL_COMPONENT)
set(TARGET_FILE ${CMAKE_BINARY_DIR}/bin/${TARGET}) set(TARGET_FILE ${CMAKE_BINARY_DIR}/bin/${TARGET})
set(SYSTEM_LIBS_SKIP set(SYSTEM_LIBS_SKIP
"libavahi-client"
"libavahi-common"
"libbsd" "libbsd"
"libc" "libc"
"libdbus-1" "libdbus-1"
@ -38,7 +36,7 @@ macro(InstallDependencies TARGET INSTALL_COMPONENT)
"libXext" "libXext"
"libXrender" "libXrender"
"libz" "libz"
) )
if(EXISTS ${TARGET_FILE}) if(EXISTS ${TARGET_FILE})
include(GetPrerequisites) include(GetPrerequisites)
@ -46,7 +44,6 @@ macro(InstallDependencies TARGET INSTALL_COMPONENT)
if (APPLE) if (APPLE)
set(OPENSSL_ROOT_DIR /usr/local/opt/openssl) set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)
endif(APPLE) endif(APPLE)
find_package(OpenSSL 1.0.0 REQUIRED)
# Extract dependencies ignoring the system ones # Extract dependencies ignoring the system ones
get_prerequisites(${TARGET_FILE} DEPENDENCIES 0 1 "" "") get_prerequisites(${TARGET_FILE} DEPENDENCIES 0 1 "" "")
@ -68,6 +65,7 @@ macro(InstallDependencies TARGET INSTALL_COMPONENT)
endforeach() endforeach()
# Append the OpenSSL library to the list # Append the OpenSSL library to the list
find_package(OpenSSL 1.0.0 REQUIRED)
if (OPENSSL_FOUND) if (OPENSSL_FOUND)
foreach(openssl_lib ${OPENSSL_LIBRARIES}) foreach(openssl_lib ${OPENSSL_LIBRARIES})
get_prerequisites(${openssl_lib} openssl_deps 0 1 "" "") get_prerequisites(${openssl_lib} openssl_deps 0 1 "" "")
@ -87,6 +85,8 @@ macro(InstallDependencies TARGET INSTALL_COMPONENT)
endforeach() endforeach()
gp_append_unique(PREREQUISITE_LIBS ${openssl_lib}) gp_append_unique(PREREQUISITE_LIBS ${openssl_lib})
get_filename_component(file_canonical ${openssl_lib} REALPATH)
gp_append_unique(PREREQUISITE_LIBS ${file_canonical})
endforeach() endforeach()
endif(OPENSSL_FOUND) endif(OPENSSL_FOUND)
@ -128,7 +128,7 @@ macro(InstallDependencies TARGET INSTALL_COMPONENT)
endforeach() endforeach()
endif() endif()
endforeach() endforeach()
endif() endif(QT_PLUGINS_DIR)
# Create a qt.conf file in 'share/hyperion/bin' to override hard-coded search paths in Qt plugins # Create a qt.conf file in 'share/hyperion/bin' to override hard-coded search paths in Qt plugins
file(WRITE "${CMAKE_BINARY_DIR}/qt.conf" "[Paths]\nPlugins=../lib/\n") file(WRITE "${CMAKE_BINARY_DIR}/qt.conf" "[Paths]\nPlugins=../lib/\n")
@ -161,7 +161,7 @@ macro(InstallDependencies TARGET INSTALL_COMPONENT)
DESTINATION "share/hyperion/lib/python" DESTINATION "share/hyperion/lib/python"
COMPONENT "${INSTALL_COMPONENT}" COMPONENT "${INSTALL_COMPONENT}"
) )
endif() endif(PYTHON_MODULES_DIR)
else() else()
# Run CMake after target was built to run get_prerequisites on ${TARGET_FILE} # Run CMake after target was built to run get_prerequisites on ${TARGET_FILE}
add_custom_command( add_custom_command(