zinface
/
lxqt-build-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Initial port to Qt6 

Pls don't rely on this... yet.
This commit is contained in:
Luís Pereira 2021-02-23 11:16:25 +00:00
parent d90ddc7162
commit 805ec6797b
No known key found for this signature in database
GPG Key ID: E2AE44354276D311
3 changed files with 69 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
CMakeLists.txt
View File

@ -1,19 +1,19 @@
cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
# CMP0000: Call the cmake_minimum_required() command at the beginning of the top-level
# CMakeLists.txt file even before calling the project() command.
# The cmake_minimum_required(VERSION) command implicitly invokes the cmake_policy(VERSION)
# command to specify that the current project code is written for the given range of CMake
# versions.
project(lxqt-build-tools)
project(lxqt2-build-tools)
option(WITH_XDG_DIRS_FALLBACK "Use our XDG_CONFIG_DIRS fallback" ON)
set(LXQT_BUILD_TOOLS_MAJOR_VERSION 0)
set(LXQT_BUILD_TOOLS_MINOR_VERSION 9)
set(LXQT_BUILD_TOOLS_MAJOR_VERSION 2)
set(LXQT_BUILD_TOOLS_MINOR_VERSION 0)
set(LXQT_BUILD_TOOLS_PATCH_VERSION 0)
set(LXQT_BUILD_TOOLS_VERSION ${LXQT_BUILD_TOOLS_MAJOR_VERSION}.${LXQT_BUILD_TOOLS_MINOR_VERSION}.${LXQT_BUILD_TOOLS_PATCH_VERSION})
# for lxqt_translate_ts we require at least Qt linguist 5.12.5 for correct file name handling
set(LXQT_MIN_LINGUIST_VERSION "5.12.5")
set(LXQT_MIN_LINGUIST_VERSION "6.2")
include(CMakePackageConfigHelpers)
include(GNUInstallDirs) # Standard directories for installation
@ -22,7 +22,7 @@ include(cmake/modules/LXQtPreventInSourceBuilds.cmake)
#-----------------------------------------------------------------------------
# LXQT_DATA_DIR defaults to CMAKE_INSTALL_FULL_DATADIR. It's added to
# XDG_DATA_DIRS by the startlxqt script
# XDG_DATA_DIRS by the startlxqt2 script
# Warning: Setting LXQT_DATA_DIR must be done after including GNUInstallDirs
#-----------------------------------------------------------------------------
if (NOT DEFINED LXQT_DATA_DIR)
@ -31,7 +31,7 @@ if (NOT DEFINED LXQT_DATA_DIR)
)
endif()
set(LXQT_LIBRARY_NAME "lxqt" CACHE STRING "lxqt")
set(LXQT_LIBRARY_NAME "lxqt2" CACHE STRING "lxqt2")
set(LXQT_RELATIVE_SHARE_DIR "${LXQT_LIBRARY_NAME}")
set(LXQT_SHARE_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/${LXQT_RELATIVE_SHARE_DIR}")
set(LXQT_RELATIVE_TRANSLATIONS_DIR "${LXQT_LIBRARY_NAME}/translations")
@ -55,8 +55,8 @@ file(GLOB toInstallModulesHelpers
#-----------------------------------------------------------------------------
# Superbuild mode
#-----------------------------------------------------------------------------
set(FIND_MODULES_INSTALL_DIR "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/lxqt-build-tools/cmake/find-modules/")
set(MODULES_INSTALL_DIR "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/lxqt-build-tools/cmake/modules/")
set(FIND_MODULES_INSTALL_DIR "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${LXQT_LIBRARY_NAME}-build-tools/cmake/find-modules/")
set(MODULES_INSTALL_DIR "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${LXQT_LIBRARY_NAME}-build-tools/cmake/modules/")
file(COPY
${toInstallFindModules}
@ -71,7 +71,7 @@ file(COPY
configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/lxqt-build-tools-config.cmake.in"
"${CMAKE_BINARY_DIR}/lxqt-build-tools-config.cmake"
"${CMAKE_BINARY_DIR}/${LXQT_LIBRARY_NAME}-build-tools-config.cmake"
INSTALL_DESTINATION "neverland" # required, altough we don't install it
PATH_VARS
MODULES_INSTALL_DIR
@ -94,13 +94,13 @@ configure_file(
#-----------------------------------------------------------------------------
# Installable mode
#-----------------------------------------------------------------------------
set(CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/lxqt-build-tools/")
set(FIND_MODULES_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/lxqt-build-tools/find-modules/")
set(MODULES_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/lxqt-build-tools/modules/")
set(CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/${LXQT_LIBRARY_NAME}-build-tools/")
set(FIND_MODULES_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/${LXQT_LIBRARY_NAME}-build-tools/find-modules/")
set(MODULES_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/${LXQT_LIBRARY_NAME}-build-tools/modules/")
configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/lxqt-build-tools-config.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/install/lxqt-build-tools-config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/install/${LXQT_LIBRARY_NAME}-build-tools-config.cmake"
INSTALL_DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
PATH_VARS
MODULES_INSTALL_DIR
@ -122,13 +122,13 @@ configure_file(
# The package version file is common to superbuild and installable mode
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/lxqt-build-tools-config-version.cmake.in"
"${CMAKE_BINARY_DIR}/lxqt-build-tools-config-version.cmake"
"${CMAKE_BINARY_DIR}/${LXQT_LIBRARY_NAME}-build-tools-config-version.cmake"
@ONLY
)
install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/install/lxqt-build-tools-config.cmake"
"${CMAKE_BINARY_DIR}/lxqt-build-tools-config-version.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/install/${LXQT_LIBRARY_NAME}-build-tools-config.cmake"
"${CMAKE_BINARY_DIR}/${LXQT_LIBRARY_NAME}-build-tools-config-version.cmake"
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
)
@ -152,4 +152,7 @@ install(
PROGRAMS
"lxqt-transupdate"
DESTINATION
"${CMAKE_INSTALL_BINDIR}")
"${CMAKE_INSTALL_BINDIR}"
RENAME
"${LXQT_LIBRARY_NAME}-transupdate"
)

20
cmake/FindInstallConfigPath.cmake
View File

@ -5,16 +5,24 @@
# qmake -query QT_INSTALL_CONFIGURATION
#
find_package(Qt6CoreTools REQUIRED)
find_package(Qt6 COMPONENTS BuildInternals Core CoreTools REQUIRED)
if(NOT DEFINED LXQT_ETC_XDG_DIR)
message(STATUS "QT6_INSTALL_CONFIGURATION: ${QT6_INSTALL_CONFIGURATION}")
message(STATUS "QT_INSTALL_DIR: ${QT_INSTALL_DIR}")
message(STATUS "QT6_INSTALL_PLUGINS: ${QT6_INSTALL_PLUGINS}")
message(STATUS "QT_INSTALL_PLUGINS: ${QT_INSTALL_PLUGINS}")
message(STATUS "QT_SYS_CONF_DIR" "${QT_SYS_CONF_DIR}")
message(STATUS "INSTALL_SYSCONFDIR: ${INSTALL_SYSCONFDIR}")
message(STATUS "INSTALL_PLUGINSDIR: ${INSTALL_PLUGINSDIR}")
if(NOT DEFINED LXQT2_ETC_XDG_DIR)
if (TARGET Qt6::qmake)
get_target_property(_qt_qmake_executable Qt6::qmake IMPORTED_LOCATION)
endif()
if(NOT _qt_qmake_executable)
message(FATAL_ERROR
"LXQT_ETC_XDG_DIR: qmake executable not found (included before qt was configured?)")
"LXQT2_ETC_XDG_DIR: qmake executable not found (included before qt was configured?)")
endif()
execute_process(COMMAND ${_qt_qmake_executable} -query QT_INSTALL_CONFIGURATION
@ -24,11 +32,11 @@ if(NOT DEFINED LXQT_ETC_XDG_DIR)
set(QT_QMAKE_EXECUTABLE ${_qt_qmake_executable}
CACHE FILEPATH "Location of the Qt6 qmake executable")
set(LXQT_ETC_XDG_DIR ${_lxqt_etc_xdg_dir}
set(LXQT2_ETC_XDG_DIR ${_lxqt_etc_xdg_dir}
CACHE FILEPATH "Location of the LXQt XDG system-wide configuration files")
message(STATUS "LXQT_ETC_XDG_DIR autodetected as '${LXQT_ETC_XDG_DIR}'")
message(STATUS "You can set it manually with -DLXQT_ETC_XDG_DIR=<value>")
message(STATUS "LXQT2_ETC_XDG_DIR autodetected as '${LXQT2_ETC_XDG_DIR}'")
message(STATUS "You can set it manually with -DLXQT2_ETC_XDG_DIR=<value>")
message(STATUS "")
endif ()

34
cmake/modules/LXQtQMake.cmake Normal file
View File

@ -0,0 +1,34 @@
find_package(Qt6Core REQUIRED QUIET)
if (TARGET Qt6::qmake)
get_target_property(_qmake_executable_default Qt6::qmake LOCATION)
endif()
set(QMAKE_EXECUTABLE ${_qmake_executable}
CACHE FILEPATH "Location of the Qt6 qmake executable")
function(query_qmake result_variable qt_variable)
set(options )
set(oneValueArgs )
set(multiValueArgs )
cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
if(NOT QMAKE_EXECUTABLE)
message(FATAL_ERROR "No qmake Qt6 binary found. Can't check ${qt_variable} as required")
endif()
execute_process(
COMMAND ${QMAKE_EXECUTABLE} -query "${qt_variable}"
RESULT_VARIABLE return_code
OUTPUT_VARIABLE output
)
if(return_code EQUAL 0)
string(STRIP "${output}" output)
file(TO_CMAKE_PATH "${output}" output_path)
set(${result_variable} "${output_path}" PARENT_SCOPE)
else()
message(WARNING "Failed call: ${QMAKE_EXECUTABLE} -query \"${qt_variable}\"")
message(FATAL_ERROR "QMake call failed: ${return_code}")
endif()
endfunction()