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

Added libjpeg-turbo to dependencies

Browse Source
This commit is contained in:
Paulchen Panther 2020-12-19 11:39:57 +01:00
parent c672ae6075
commit c24b972325
1 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmake/Dependencies.cmake
View File

@ -234,7 +234,7 @@ macro(DeployWindows TARGET)
list(REMOVE_AT DEPENDENCIES 0 1) list(REMOVE_AT DEPENDENCIES 0 1)
endwhile() endwhile()
# Copy OpenSSL Libs # Copy libssl/libcrypto to 'hyperion'
if (OPENSSL_FOUND) if (OPENSSL_FOUND)
string(REGEX MATCHALL "[0-9]+" openssl_versions "${OPENSSL_VERSION}") string(REGEX MATCHALL "[0-9]+" openssl_versions "${OPENSSL_VERSION}")
list(GET openssl_versions 0 openssl_version_major) list(GET openssl_versions 0 openssl_version_major)
@ -264,6 +264,27 @@ macro(DeployWindows TARGET)
) )
endif(OPENSSL_FOUND) endif(OPENSSL_FOUND)
# Copy libjpeg-turbo to 'hyperion'
if (ENABLE_MF AND TURBOJPEG_FOUND)
find_file(TURBOJPEG_DLL
NAMES "turbojpeg.dll"
PATHS ${TurboJPEG_INCLUDE_DIRS}/.. ${TurboJPEG_INCLUDE_DIRS}/../bin
NO_DEFAULT_PATH
)
find_file(JPEG_DLL
NAMES "jpeg62.dll"
PATHS ${TurboJPEG_INCLUDE_DIRS}/.. ${TurboJPEG_INCLUDE_DIRS}/../bin
NO_DEFAULT_PATH
)
install(
FILES ${TURBOJPEG_DLL} ${JPEG_DLL}
DESTINATION "bin"
COMPONENT "Hyperion"
)
endif()
# Create a qt.conf file in 'bin' to override hard-coded search paths in Qt plugins # Create a qt.conf file in '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")
install( install(
@ -311,6 +332,7 @@ macro(DeployWindows TARGET)
) )
endforeach() endforeach()
if (ENABLE_DX)
# Download DirectX End-User Runtimes (June 2010) # Download DirectX End-User Runtimes (June 2010)
set(url "https://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe") set(url "https://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe")
if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/dx_redist.exe") if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/dx_redist.exe")
@ -332,6 +354,7 @@ macro(DeployWindows TARGET)
DESTINATION "bin" DESTINATION "bin"
COMPONENT "Hyperion" COMPONENT "Hyperion"
) )
endif(ENABLE_DX)
else() else()
# Run CMake after target was built # Run CMake after target was built