New upstream version 23.2.1+dfsg1
This commit is contained in:
Simon Chopin
parent
cdc9a9fc87
commit
b14f9eae6d
1017 changed files with 37232 additions and 11111 deletions
|
|
@ -151,23 +151,36 @@ file(GLOB QT_DEBUG_BIN_FILES
|
|||
"${Qt5Core_DIR}/../../../bin/Qt5Cored.dll"
|
||||
"${Qt5Core_DIR}/../../../bin/Qt5Guid.dll"
|
||||
"${Qt5Core_DIR}/../../../bin/Qt5Widgetsd.dll"
|
||||
"${Qt5Core_DIR}/../../../bin/Qt5Svgd.dll"
|
||||
"${Qt5Core_DIR}/../../../bin/Qt5Xmld.dll"
|
||||
"${Qt5Core_DIR}/../../../bin/libGLESv2d.dll"
|
||||
"${Qt5Core_DIR}/../../../bin/libEGLd.dll")
|
||||
file(GLOB QT_DEBUG_PLAT_BIN_FILES
|
||||
"${Qt5Core_DIR}/../../../plugins/platforms/qwindowsd.dll")
|
||||
file(GLOB QT_DEBUG_STYLES_BIN_FILES
|
||||
"${Qt5Core_DIR}/../../../plugins/styles/qwindowsvistastyled.dll")
|
||||
file(GLOB QT_DEBUG_ICONENGINE_BIN_FILES
|
||||
"${Qt5Core_DIR}/../../../plugins/iconengines/qsvgicond.dll")
|
||||
file(GLOB QT_DEBUG_IMAGEFORMATS_BIN_FILES
|
||||
"${Qt5Core_DIR}/../../../plugins/imageformats/qsvgd.dll")
|
||||
|
||||
|
||||
file(GLOB QT_BIN_FILES
|
||||
"${Qt5Core_DIR}/../../../bin/Qt5Core.dll"
|
||||
"${Qt5Core_DIR}/../../../bin/Qt5Gui.dll"
|
||||
"${Qt5Core_DIR}/../../../bin/Qt5Widgets.dll"
|
||||
"${Qt5Core_DIR}/../../../bin/Qt5Svg.dll"
|
||||
"${Qt5Core_DIR}/../../../bin/Qt5Xml.dll"
|
||||
"${Qt5Core_DIR}/../../../bin/libGLESv2.dll"
|
||||
"${Qt5Core_DIR}/../../../bin/libEGL.dll")
|
||||
file(GLOB QT_PLAT_BIN_FILES
|
||||
"${Qt5Core_DIR}/../../../plugins/platforms/qwindows.dll")
|
||||
file(GLOB QT_STYLES_BIN_FILES
|
||||
"${Qt5Core_DIR}/../../../plugins/styles/qwindowsvistastyle.dll")
|
||||
file(GLOB QT_ICONENGINE_BIN_FILES
|
||||
"${Qt5Core_DIR}/../../../plugins/iconengines/qsvgicon.dll")
|
||||
file(GLOB QT_IMAGEFORMATS_BIN_FILES
|
||||
"${Qt5Core_DIR}/../../../plugins/imageformats/qsvg.dll")
|
||||
|
||||
file(GLOB QT_ICU_BIN_FILES
|
||||
"${Qt5Core_DIR}/../../../bin/icu*.dll")
|
||||
|
|
@ -201,10 +214,24 @@ set(ALL_STYLES_REL_BIN_FILES
|
|||
set(ALL_STYLES_DBG_BIN_FILES
|
||||
${QT_DEBUG_STYLES_BIN_FILES})
|
||||
|
||||
set(ALL_ICONENGINE_BIN_FILES)
|
||||
set(ALL_ICONENGINE_REL_BIN_FILES
|
||||
${QT_ICONENGINE_BIN_FILES})
|
||||
set(ALL_ICONENGINE_DBG_BIN_FILES
|
||||
${QT_DEBUG_ICONENGINE_BIN_FILES})
|
||||
|
||||
set(ALL_IMAGEFORMATS_BIN_FILES)
|
||||
set(ALL_IMAGEFORMATS_REL_BIN_FILES
|
||||
${QT_IMAGEFORMATS_BIN_FILES})
|
||||
set(ALL_IMAGEFORMATS_DBG_BIN_FILES
|
||||
${QT_DEBUG_ICONENGINE_BIN_FILES})
|
||||
|
||||
foreach(list
|
||||
ALL_BASE_BIN_FILES ALL_REL_BIN_FILES ALL_DBG_BIN_FILES
|
||||
ALL_PLATFORM_BIN_FILES ALL_PLATFORM_REL_BIN_FILES ALL_PLATFORM_DBG_BIN_FILES
|
||||
ALL_STYLES_BIN_FILES ALL_STYLES_REL_BIN_FILES ALL_STYLES_DBG_BIN_FILES)
|
||||
ALL_STYLES_BIN_FILES ALL_STYLES_REL_BIN_FILES ALL_STYLES_DBG_BIN_FILES
|
||||
ALL_ICONENGINE_BIN_FILES ALL_ICONENGINE_REL_BIN_FILES ALL_ICONENGINE_DGB_BIN_FILES
|
||||
ALL_IMAGEFORMATS_BIN_FILES ALL_IMAGEFORMATS_REL_BIN_FILES ALL_IMAGEFORMATS_DGB_BIN_FILES)
|
||||
if(${list})
|
||||
list(REMOVE_DUPLICATES ${list})
|
||||
endif()
|
||||
|
|
@ -221,9 +248,13 @@ message(STATUS "zlib files: ${ZLIB_BIN_FILES}")
|
|||
message(STATUS "QT Debug files: ${QT_DEBUG_BIN_FILES}")
|
||||
message(STATUS "QT Debug Platform files: ${QT_DEBUG_PLAT_BIN_FILES}")
|
||||
message(STATUS "QT Debug Styles files: ${QT_DEBUG_STYLES_BIN_FILES}")
|
||||
message(STATUS "QT Debug Iconengine files: ${QT_DEBUG_ICONENGINE_BIN_FILES}")
|
||||
message(STATUS "QT Debug Imageformat files: ${QT_DEBUG_IMAGEFORMATS_BIN_FILES}")
|
||||
message(STATUS "QT Release files: ${QT_BIN_FILES}")
|
||||
message(STATUS "QT Release Platform files: ${QT_PLAT_BIN_FILES}")
|
||||
message(STATUS "QT Release Styles files: ${QT_STYLES_BIN_FILES}")
|
||||
message(STATUS "QT Release Iconengine files: ${QT_REL_ICONENGINE_BIN_FILES}")
|
||||
message(STATUS "QT Release Imageformat files: ${QT_REL_IMAGEFORMATS_BIN_FILES}")
|
||||
message(STATUS "QT ICU files: ${QT_ICU_BIN_FILES}")
|
||||
|
||||
foreach(BinFile ${ALL_BASE_BIN_FILES})
|
||||
|
|
@ -271,4 +302,34 @@ foreach(BinFile ${ALL_STYLES_DBG_BIN_FILES})
|
|||
file(COPY "${BinFile}" DESTINATION "${CMAKE_SOURCE_DIR}/additional_install_files/exec${_bin_suffix}d/styles/")
|
||||
endforeach()
|
||||
|
||||
foreach(BinFile ${ALL_ICONENGINE_BIN_FILES})
|
||||
make_directory("${CMAKE_SOURCE_DIR}/additional_install_files/exec${_bin_suffix}/iconengines")
|
||||
file(COPY "${BinFile}" DESTINATION "${CMAKE_SOURCE_DIR}/additional_install_files/exec${_bin_suffix}/iconengines/")
|
||||
endforeach()
|
||||
|
||||
foreach(BinFile ${ALL_ICONENGINE_REL_BIN_FILES})
|
||||
make_directory("${CMAKE_SOURCE_DIR}/additional_install_files/exec${_bin_suffix}r/iconengines")
|
||||
file(COPY "${BinFile}" DESTINATION "${CMAKE_SOURCE_DIR}/additional_install_files/exec${_bin_suffix}r/iconengines/")
|
||||
endforeach()
|
||||
|
||||
foreach(BinFile ${ALL_ICONENGINE_DBG_BIN_FILES})
|
||||
make_directory("${CMAKE_SOURCE_DIR}/additional_install_files/exec${_bin_suffix}d/iconengines")
|
||||
file(COPY "${BinFile}" DESTINATION "${CMAKE_SOURCE_DIR}/additional_install_files/exec${_bin_suffix}d/iconengines/")
|
||||
endforeach()
|
||||
|
||||
foreach(BinFile ${ALL_IMAGEFORMATS_BIN_FILES})
|
||||
make_directory("${CMAKE_SOURCE_DIR}/additional_install_files/exec${_bin_suffix}/imageformats")
|
||||
file(COPY "${BinFile}" DESTINATION "${CMAKE_SOURCE_DIR}/additional_install_files/exec${_bin_suffix}/imageformats/")
|
||||
endforeach()
|
||||
|
||||
foreach(BinFile ${ALL_IMAGEFORMATS_REL_BIN_FILES})
|
||||
make_directory("${CMAKE_SOURCE_DIR}/additional_install_files/exec${_bin_suffix}r/imageformats")
|
||||
file(COPY "${BinFile}" DESTINATION "${CMAKE_SOURCE_DIR}/additional_install_files/exec${_bin_suffix}r/imageformats/")
|
||||
endforeach()
|
||||
|
||||
foreach(BinFile ${ALL_IMAGEFORMATS_DBG_BIN_FILES})
|
||||
make_directory("${CMAKE_SOURCE_DIR}/additional_install_files/exec${_bin_suffix}d/imageformats")
|
||||
file(COPY "${BinFile}" DESTINATION "${CMAKE_SOURCE_DIR}/additional_install_files/exec${_bin_suffix}d/imageformats/")
|
||||
endforeach()
|
||||
|
||||
set(COPIED_DEPENDENCIES TRUE CACHE BOOL "Dependencies have been copied, set to false to copy again" FORCE)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
find_package(PkgConfig QUIET)
|
||||
if (PKG_CONFIG_FOUND)
|
||||
pkg_check_modules(_VLC QUIET VLC)
|
||||
pkg_check_modules(_VLC QUIET libvlc)
|
||||
endif()
|
||||
|
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
|
|
|
|||
|
|
@ -504,6 +504,30 @@ function(install_obs_data target datadir datadest)
|
|||
endif()
|
||||
endfunction()
|
||||
|
||||
function(install_obs_data_file target datafile datadest)
|
||||
install(FILES ${datafile}
|
||||
DESTINATION "${OBS_DATA_DESTINATION}/${datadest}")
|
||||
add_custom_command(TARGET ${target} POST_BUILD
|
||||
COMMAND "${CMAKE_COMMAND}" -E make_directory
|
||||
"${OBS_OUTPUT_DIR}/$<CONFIGURATION>/data/${datadest}"
|
||||
VERBATIM)
|
||||
add_custom_command(TARGET ${target} POST_BUILD
|
||||
COMMAND "${CMAKE_COMMAND}" -E copy
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/${datafile}" "${OBS_OUTPUT_DIR}/$<CONFIGURATION>/data/${datadest}"
|
||||
VERBATIM)
|
||||
|
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND DEFINED ENV{obsInstallerTempDir})
|
||||
add_custom_command(TARGET ${target} POST_BUILD
|
||||
COMMAND "${CMAKE_COMMAND}" -E make_directory
|
||||
"$ENV{obsInstallerTempDir}/${OBS_DATA_DESTINATION}/${datadest}"
|
||||
VERBATIM)
|
||||
add_custom_command(TARGET ${target} POST_BUILD
|
||||
COMMAND "${CMAKE_COMMAND}" -E copy
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/${datafile}" "$ENV{obsInstallerTempDir}/${OBS_DATA_DESTINATION}/${datadest}"
|
||||
VERBATIM)
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
function(install_obs_datatarget target datadest)
|
||||
install(TARGETS ${target}
|
||||
LIBRARY DESTINATION "${OBS_DATA_DESTINATION}/${datadest}"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue