napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: apply gersemi styling

Browse Source
This commit is contained in:
Adriaan de Groot 2022-02-08 16:18:47 +01:00
parent b167d8da03
commit cf097850de
44 changed files with 649 additions and 740 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

219
CMakeLists.txt
View File

@ -54,10 +54,7 @@ if ( CMAKE_SCRIPT_MODE_FILE )
return()
endif()
project( CALAMARES
VERSION ${CALAMARES_VERSION}
LANGUAGES C CXX
)
project(CALAMARES VERSION ${CALAMARES_VERSION} LANGUAGES C CXX)
if(CALAMARES_RELEASE_MODE AND CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
message(FATAL_ERROR "Do not build development versions in the source-directory.")
@ -78,7 +75,6 @@ option( BUILD_SCHEMA_TESTING "Enable schema-validation-tests" ON )
# Options for the calamares executable
option(BUILD_KF5Crash "Enable crash reporting with KCrash." ON)
# Possible debugging flags are:
# - DEBUG_TIMEZONES draws latitude and longitude lines on the timezone
# widget and enables chatty debug logging, for dealing with the timezone
@ -88,7 +84,6 @@ option( BUILD_KF5Crash "Enable crash reporting with KCrash." ON )
# - DEBUG_PARTITION_UNSAFE (see partition/CMakeLists.txt)
# - DEBUG_PARTITION_LAME (see partition/CMakeLists.txt)
### USE_*
#
# By convention, when there are multiple modules that implement similar
@ -119,8 +114,7 @@ set( USE_services "" CACHE STRING "Select the services module to use" )
set(CALAMARES_ORGANIZATION_NAME "Calamares")
set(CALAMARES_ORGANIZATION_DOMAIN "github.com/calamares")
set(CALAMARES_APPLICATION_NAME "Calamares")
set( CALAMARES_DESCRIPTION_SUMMARY
"The distribution-independent installer framework" )
set(CALAMARES_DESCRIPTION_SUMMARY "The distribution-independent installer framework")
### Transifex (languages) info
#
@ -147,14 +141,87 @@ set( CALAMARES_DESCRIPTION_SUMMARY
# `txstats.py -e`. See also
#
# Total 74 languages
set( _tx_complete az az_AZ ca de fa fi_FI he hi hr ja ko lt pt_BR
pt_PT si sq sv tr_TR uk zh_TW )
set( _tx_good as be ca@valencia cs_CZ da fr fur it_IT ml nl ru sk
tg vi zh_CN )
set( _tx_ok ar ast bg bn el en_GB es es_MX et eu gl hu id is mr nb
pl ro sl sr sr@latin th )
set( _tx_incomplete eo es_PR gu ie kk kn lo lv mk ne ne_NP ta_IN te
ur zh zh_HK )
set(_tx_complete
az
az_AZ
ca
de
fa
fi_FI
he
hi
hr
ja
ko
lt
pt_BR
pt_PT
si
sq
sv
tr_TR
uk
zh_TW
)
set(_tx_good
as
be
ca@valencia
cs_CZ
da
fr
fur
it_IT
ml
nl
ru
sk
tg
vi
zh_CN
)
set(_tx_ok
ar
ast
bg
bn
el
en_GB
es
es_MX
et
eu
gl
hu
id
is
mr
nb
pl
ro
sl
sr
sr@latin
th
)
set(_tx_incomplete
eo
es_PR
gu
ie
kk
kn
lo
lv
mk
ne
ne_NP
ta_IN
te
ur
zh
zh_HK
)
### Required versions
#
@ -165,7 +232,6 @@ set( ECM_VERSION 5.18 )
set(PYTHONLIBS_VERSION 3.6)
set(BOOSTPYTHON_VERSION 1.67.0)
### CMAKE SETUP
#
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules")
@ -180,7 +246,9 @@ if( POLICY CMP0071 )
endif()
# Recognize more macros to trigger automoc
if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
list(APPEND CMAKE_AUTOMOC_MACRO_NAMES
list(
APPEND
CMAKE_AUTOMOC_MACRO_NAMES
"K_PLUGIN_FACTORY_WITH_JSON"
"K_EXPORT_PLASMA_DATAENGINE_WITH_JSON"
"K_EXPORT_PLASMA_RUNNER"
@ -230,7 +298,8 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
# Clang warnings: doing *everything* is counter-productive, since it warns
# about things which we can't fix (e.g. C++98 incompatibilities, but
# Calamares is C++17).
foreach( CLANG_WARNINGS
foreach(
CLANG_WARNINGS
-Weverything
-Wno-c++98-compat
-Wno-c++98-compat-pedantic
@ -270,16 +339,14 @@ endif()
# Use mark_thirdparty_code() to reduce warnings from the compiler
# on code that we're not going to fix. Call this with a list of files.
macro(mark_thirdparty_code)
set_source_files_properties( ${ARGV}
PROPERTIES
COMPILE_FLAGS "${SUPPRESS_3RDPARTY_WARNINGS}"
COMPILE_DEFINITIONS "THIRDPARTY"
set_source_files_properties(
${ARGV}
PROPERTIES COMPILE_FLAGS "${SUPPRESS_3RDPARTY_WARNINGS}" COMPILE_DEFINITIONS "THIRDPARTY"
)
endmacro()
if(CMAKE_COMPILER_IS_GNUCXX)
if( CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9 OR
CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.9 )
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.9)
message(STATUS "Found GNU g++ ${CMAKE_CXX_COMPILER_VERSION}, enabling colorized error messages.")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=auto")
endif()
@ -305,7 +372,8 @@ else()
find_package(PolkitQt5-1)
endif()
set_package_properties(
PolkitQt5-1 PROPERTIES
PolkitQt5-1
PROPERTIES
DESCRIPTION "Qt5 support for Polkit"
URL "https://cgit.kde.org/polkit-qt-1.git"
PURPOSE "PolkitQt5-1 helps with installing Polkit configuration"
@ -328,14 +396,16 @@ endif()
find_package(KF5 QUIET COMPONENTS CoreAddons Crash DBusAddons)
set_package_properties(
KF5::CoreAddons PROPERTIES
KF5::CoreAddons
PROPERTIES
TYPE REQUIRED
DESCRIPTION "Classes built on QtCore for About Data"
URL "https://api.kde.org/frameworks/kcoreaddons/"
PURPOSE "About Calamares"
)
set_package_properties(
KF5::DBusAddons PROPERTIES
KF5::DBusAddons
PROPERTIES
TYPE REQUIRED
DESCRIPTION "Classes for DBus activation"
URL "https://api.kde.org/frameworks/dbusaddons/"
@ -351,7 +421,8 @@ endif()
# TODO:3.3: Use FindPython3 instead
find_package(PythonInterp ${PYTHONLIBS_VERSION})
set_package_properties(
PythonInterp PROPERTIES
PythonInterp
PROPERTIES
DESCRIPTION "Python 3 interpreter."
URL "https://python.org"
PURPOSE "Python 3 interpreter for certain tests."
@ -366,9 +437,18 @@ if ( PYTHONINTERP_FOUND )
if(CALAMARES_CONFIGVALIDATOR_CHECKED)
set(_validator_deps ${CALAMARES_CONFIGVALIDATOR_RESULT})
else()
exec_program( ${PYTHON_EXECUTABLE} ARGS "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" -x RETURN_VALUE _validator_deps )
exec_program(
${PYTHON_EXECUTABLE}
ARGS
"${CMAKE_SOURCE_DIR}/ci/configvalidator.py"
-x
RETURN_VALUE
_validator_deps
)
set(CALAMARES_CONFIGVALIDATOR_CHECKED TRUE CACHE INTERNAL "Dependencies for configvalidator checked")
set( CALAMARES_CONFIGVALIDATOR_RESULT ${_validator_deps} CACHE INTERNAL "Result of configvalidator dependency check" )
set(CALAMARES_CONFIGVALIDATOR_RESULT ${_validator_deps}
CACHE INTERNAL "Result of configvalidator dependency check"
)
endif()
# It should never succeed, but only returns 1 when the imports fail
if(_validator_deps EQUAL 1)
@ -385,7 +465,8 @@ add_feature_info( yaml-schema BUILD_SCHEMA_TESTING "Validate YAML (config files)
find_package(PythonLibs ${PYTHONLIBS_VERSION})
set_package_properties(
PythonLibs PROPERTIES
PythonLibs
PROPERTIES
DESCRIPTION "C interface libraries for the Python 3 interpreter."
URL "https://python.org"
PURPOSE "Python 3 is used for Python job modules."
@ -399,10 +480,7 @@ if ( PYTHONLIBS_FOUND )
set(Boost_NO_BOOST_CMAKE ON)
include(BoostPython3)
find_boost_python3( ${BOOSTPYTHON_VERSION} ${PYTHONLIBS_VERSION_STRING} CALAMARES_BOOST_PYTHON3_FOUND )
set_package_properties(
Boost PROPERTIES
PURPOSE "Boost.Python is used for Python job modules."
)
set_package_properties(Boost PROPERTIES PURPOSE "Boost.Python is used for Python job modules.")
endif()
if(NOT PYTHONLIBS_FOUND OR NOT CALAMARES_BOOST_PYTHON3_FOUND)
@ -508,7 +586,6 @@ endif()
# "http://tldp.org/HOWTO/SquashFS-HOWTO/creatingandusing.html"
add_feature_info(ExampleDistro ${mksquashfs_FOUND} "Create example-distro target.")
### CALAMARES PROPER
#
set(CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH})
@ -531,18 +608,11 @@ endif()
# Special target for not-RC (e.g. might-be-release) builds.
# This is used by the release script to get the version.
if(CALAMARES_VERSION_RC EQUAL 0)
add_custom_target(show-version
${CMAKE_COMMAND} -E echo CALAMARES_VERSION=${CALAMARES_VERSION_SHORT}
USES_TERMINAL
)
add_custom_target(show-version ${CMAKE_COMMAND} -E echo CALAMARES_VERSION=${CALAMARES_VERSION_SHORT} USES_TERMINAL)
endif()
# enforce using constBegin, constEnd for const-iterators
add_definitions(
-DQT_STRICT_ITERATORS
-DQT_SHARED
-DQT_SHAREDPOINTER_TRACK_POINTERS
)
add_definitions(-DQT_STRICT_ITERATORS -DQT_SHARED -DQT_SHAREDPOINTER_TRACK_POINTERS)
# set paths
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
@ -583,22 +653,14 @@ configure_package_config_file(
"CalamaresConfig.cmake.in"
"${PROJECT_BINARY_DIR}/CalamaresConfig.cmake"
INSTALL_DESTINATION "${CMAKE_INSTALL_CMAKEDIR}"
PATH_VARS
CMAKE_INSTALL_INCLUDEDIR
CMAKE_INSTALL_LIBDIR
CMAKE_INSTALL_DATADIR
PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_DATADIR
)
write_basic_package_version_file(
${PROJECT_BINARY_DIR}/CalamaresConfigVersion.cmake
VERSION ${PROJECT_VERSION}
COMPATIBILITY SameMajorVersion
)
install(
EXPORT Calamares
DESTINATION "${CMAKE_INSTALL_CMAKEDIR}"
FILE "CalamaresTargets.cmake"
NAMESPACE Calamares::
)
install(EXPORT Calamares DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" FILE "CalamaresTargets.cmake" NAMESPACE Calamares::)
# Install the cmake files
install(
@ -615,25 +677,18 @@ install(
"CMakeModules/CalamaresCheckModuleSelection.cmake"
"CMakeModules/CMakeColors.cmake"
"CMakeModules/FindYAMLCPP.cmake"
DESTINATION
"${CMAKE_INSTALL_CMAKEDIR}"
DESTINATION "${CMAKE_INSTALL_CMAKEDIR}"
)
### Miscellaneous installs
#
#
if(INSTALL_CONFIG)
install(
FILES settings.conf
DESTINATION share/calamares
)
install(FILES settings.conf DESTINATION share/calamares)
endif()
if(INSTALL_POLKIT)
install(
FILES com.github.calamares.calamares.policy
DESTINATION "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}"
)
install(FILES com.github.calamares.calamares.policy DESTINATION "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}")
endif()
if(INSTALL_COMPLETION)
@ -644,40 +699,26 @@ if ( INSTALL_COMPLETION )
install(FILES ${CMAKE_SOURCE_DIR}/data/completion/bash/calamares DESTINATION "${CMAKE_INSTALL_BASHCOMPLETIONDIR}")
endif()
install(
FILES calamares.desktop
DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
)
install(FILES calamares.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
install(
FILES man/calamares.8
DESTINATION ${CMAKE_INSTALL_MANDIR}/man8/
)
install(FILES man/calamares.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8/)
# uninstall target
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY
IMMEDIATE
@ONLY
)
add_custom_target( uninstall
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
)
add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
### CMAKE SUMMARY REPORT
#
get_directory_property( SKIPPED_MODULES
DIRECTORY src/modules
DEFINITION LIST_SKIPPED_MODULES
)
get_directory_property(SKIPPED_MODULES DIRECTORY src/modules DEFINITION LIST_SKIPPED_MODULES)
calamares_explain_skipped_modules( ${SKIPPED_MODULES} )
feature_summary(
WHAT DISABLED_FEATURES
DESCRIPTION "The following features have been disabled:"
QUIET_ON_EMPTY
)
feature_summary(WHAT DISABLED_FEATURES DESCRIPTION "The following features have been disabled:" QUIET_ON_EMPTY)
feature_summary(
WHAT OPTIONAL_PACKAGES_NOT_FOUND
DESCRIPTION "The following OPTIONAL packages were not found:"
@ -697,7 +738,9 @@ feature_summary(
# TODO:3.3 With newer CMake, move HOMEPAGE_URL to the project()call
set(CPACK_PACKAGE_VENDOR calamares)
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A Linux system installer")
set(CPACK_PACKAGE_DESCRIPTION "Calamares is a Linux system installer, intended for Linux distributions to use on their ISOs and other bootable media to install the distribution to the end-user's computer. Calamares can also be used as an OEM configuration tool. It is modular, extensible and highly-configurable for Linux distributions from all five major Linux families.")
set(CPACK_PACKAGE_DESCRIPTION
"Calamares is a Linux system installer, intended for Linux distributions to use on their ISOs and other bootable media to install the distribution to the end-user's computer. Calamares can also be used as an OEM configuration tool. It is modular, extensible and highly-configurable for Linux distributions from all five major Linux families."
)
set(CPACK_PACKAGE_HOMEPAGE_URL "https://calamares.io")
set(CPACK_PACKAGE_ICON "data/images/squid.png")

28
src/calamares/CMakeLists.txt
View File

@ -8,10 +8,8 @@ set( calamaresSources
main.cpp
CalamaresApplication.cpp
CalamaresWindow.cpp
DebugWindow.cpp
VariantModel.cpp
progresstree/ProgressTreeDelegate.cpp
progresstree/ProgressTreeView.cpp
)
@ -33,11 +31,7 @@ include_directories(
# library (it's just the result of a QRC compile).
add_executable(calamares_bin ${calamaresSources} calamares.qrc)
target_include_directories(calamares_bin PRIVATE ${CMAKE_SOURCE_DIR})
set_target_properties(calamares_bin
PROPERTIES
ENABLE_EXPORTS TRUE
RUNTIME_OUTPUT_NAME calamares
)
set_target_properties(calamares_bin PROPERTIES ENABLE_EXPORTS TRUE RUNTIME_OUTPUT_NAME calamares)
calamares_automoc( calamares_bin )
calamares_autouic( calamares_bin )
calamares_autorcc( calamares_bin )
@ -46,27 +40,19 @@ if( kdsagSources )
set_source_files_properties(${kdsagSources} PROPERTIES AUTOMOC OFF)
endif()
target_link_libraries( calamares_bin
PRIVATE
calamares
calamaresui
calamares-i18n
Qt5::Core
Qt5::Widgets
KF5::CoreAddons
KF5::DBusAddons
target_link_libraries(
calamares_bin
PRIVATE calamares calamaresui calamares-i18n Qt5::Core Qt5::Widgets KF5::CoreAddons KF5::DBusAddons
)
if(BUILD_KF5Crash)
target_link_libraries(calamares_bin PRIVATE KF5::Crash)
target_compile_definitions(calamares_bin PRIVATE BUILD_KF5Crash)
endif()
install( TARGETS calamares_bin
BUNDLE DESTINATION .
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
install(TARGETS calamares_bin BUNDLE DESTINATION . RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
install( FILES ${CMAKE_SOURCE_DIR}/data/images/squid.svg
install(
FILES ${CMAKE_SOURCE_DIR}/data/images/squid.svg
RENAME calamares.svg
DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps
)

5
src/modules/CMakeLists.txt
View File

@ -51,11 +51,12 @@ if ( BUILD_TESTING AND BUILD_SCHEMA_TESTING AND PYTHONINTERP_FOUND AND PYTHON_EX
get_filename_component(_conf_base "${_conf_file}" NAME_WE)
add_test(
NAME validate-${SUBDIRECTORY}-${_conf_base}
COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" "${_schema_file}" "${_conf_file}"
COMMAND
${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" "${_schema_file}"
"${_conf_file}"
)
endif()
endforeach()
endif()
endforeach()
endif()

3
src/modules/contextualprocess/CMakeLists.txt
View File

@ -16,6 +16,5 @@ calamares_add_test(
SOURCES
Tests.cpp
ContextualProcessJob.cpp # Builds it a second time
LIBRARIES
yamlcpp::yamlcpp
LIBRARIES yamlcpp::yamlcpp
)

3
src/modules/fsresizer/CMakeLists.txt
View File

@ -27,8 +27,7 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND
calamares_add_test(
fsresizertest
SOURCES
Tests.cpp
SOURCES Tests.cpp
LIBRARIES
calamares_job_fsresizer # From above
yamlcpp::yamlcpp

8
src/modules/grubcfg/tests/CMakeTests.txt
View File

@ -8,12 +8,10 @@
add_test(
NAME make-grubcfg-dirs
COMMAND ${CMAKE_COMMAND} -E make_directory
/tmp/calamares/grubcfg-test-2/etc/default
/tmp/calamares/grubcfg-test-3/etc/default
/tmp/calamares/grubcfg-test-4/etc/default/grub.d
COMMAND
${CMAKE_COMMAND} -E make_directory /tmp/calamares/grubcfg-test-2/etc/default
/tmp/calamares/grubcfg-test-3/etc/default /tmp/calamares/grubcfg-test-4/etc/default/grub.d
)
set_tests_properties(load-grubcfg-2 PROPERTIES DEPENDS make-grubcfg-dirs)
set_tests_properties(load-grubcfg-3 PROPERTIES DEPENDS make-grubcfg-dirs)
set_tests_properties(load-grubcfg-4 PROPERTIES DEPENDS make-grubcfg-dirs)

3
src/modules/initcpio/CMakeLists.txt
View File

@ -13,8 +13,7 @@ calamares_add_plugin( initcpio
calamares_add_test(
initcpiotest
SOURCES
Tests.cpp
SOURCES Tests.cpp
LIBRARIES
calamares_job_initcpio # From above
yamlcpp::yamlcpp

3
src/modules/initramfs/CMakeLists.txt
View File

@ -13,8 +13,7 @@ calamares_add_plugin( initramfs
calamares_add_test(
initramfstest
SOURCES
Tests.cpp
SOURCES Tests.cpp
LIBRARIES
calamares_job_initramfs # From above
yamlcpp::yamlcpp

10
src/modules/interactiveterminal/CMakeLists.txt
View File

@ -9,14 +9,8 @@ set( kf5_ver 5.41 )
find_package(KF5Service ${kf5_ver})
find_package(KF5Parts ${kf5_ver})
set_package_properties(
KF5Service PROPERTIES
PURPOSE "For finding KDE services at runtime"
)
set_package_properties(
KF5Parts PROPERTIES
PURPOSE "For finding KDE parts at runtime"
)
set_package_properties(KF5Service PROPERTIES PURPOSE "For finding KDE services at runtime")
set_package_properties(KF5Parts PROPERTIES PURPOSE "For finding KDE parts at runtime")
if(KF5Parts_FOUND AND KF5Service_FOUND)
calamares_add_plugin(interactiveterminal

9
src/modules/keyboard/CMakeLists.txt
View File

@ -21,11 +21,4 @@ calamares_add_plugin( keyboard
SHARED_LIB
)
calamares_add_test(
keyboardtest
SOURCES
Tests.cpp
SetKeyboardLayoutJob.cpp
RESOURCES
keyboard.qrc
)
calamares_add_test(keyboardtest SOURCES Tests.cpp SetKeyboardLayoutJob.cpp RESOURCES keyboard.qrc)

14
src/modules/locale/CMakeLists.txt
View File

@ -39,15 +39,7 @@ calamares_add_plugin( locale
calamares_add_test(
localetest
SOURCES
Tests.cpp
Config.cpp
LocaleConfiguration.cpp
SetTimezoneJob.cpp
timezonewidget/TimeZoneImage.cpp
DEFINITIONS
SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images"
DEBUG_TIMEZONES=1
LIBRARIES
Qt5::Gui
SOURCES Tests.cpp Config.cpp LocaleConfiguration.cpp SetTimezoneJob.cpp timezonewidget/TimeZoneImage.cpp
DEFINITIONS SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images" DEBUG_TIMEZONES=1
LIBRARIES Qt5::Gui
)

10
src/modules/localeq/CMakeLists.txt
View File

@ -17,15 +17,9 @@ if( DEBUG_TIMEZONES )
endif()
find_package(Qt5Location CONFIG)
set_package_properties(Qt5Location PROPERTIES
DESCRIPTION "Used for rendering the map"
TYPE RUNTIME
)
set_package_properties(Qt5Location PROPERTIES DESCRIPTION "Used for rendering the map" TYPE RUNTIME)
find_package(Qt5Positioning CONFIG)
set_package_properties(Qt5Positioning PROPERTIES
DESCRIPTION "Used for GeoLocation and GeoCoding"
TYPE RUNTIME
)
set_package_properties(Qt5Positioning PROPERTIES DESCRIPTION "Used for GeoLocation and GeoCoding" TYPE RUNTIME)
# Because we're sharing sources with the regular locale module
set(_locale ${CMAKE_CURRENT_SOURCE_DIR}/../locale)

7
src/modules/luksopenswaphookcfg/CMakeLists.txt
View File

@ -14,9 +14,4 @@ calamares_add_plugin( luksopenswaphookcfg
SHARED_LIB
)
calamares_add_test(
luksopenswaphooktest
SOURCES
LOSHJob.cpp
Tests.cpp
)
calamares_add_test(luksopenswaphooktest SOURCES LOSHJob.cpp Tests.cpp)

8
src/modules/machineid/CMakeLists.txt
View File

@ -12,10 +12,4 @@ calamares_add_plugin( machineid
SHARED_LIB
)
calamares_add_test(
machineidtest
SOURCES
Tests.cpp
MachineIdJob.cpp
Workers.cpp
)
calamares_add_test(machineidtest SOURCES Tests.cpp MachineIdJob.cpp Workers.cpp)

10
src/modules/packagechooser/CMakeLists.txt
View File

@ -28,7 +28,8 @@ option( WITH_APPSTREAM "Support appstream: items in PackageChooser (requires lib
if(WITH_APPSTREAM)
find_package(AppStreamQt)
set_package_properties(
AppStreamQt PROPERTIES
AppStreamQt
PROPERTIES
DESCRIPTION "Support for AppStream (cache) data"
URL "https://github.com/ximion/appstream"
PURPOSE "AppStream provides package data"
@ -62,9 +63,6 @@ calamares_add_plugin( packagechooser
calamares_add_test(
packagechoosertest
GUI
SOURCES
Tests.cpp
LIBRARIES
calamares_viewmodule_packagechooser
${_extra_libraries}
SOURCES Tests.cpp
LIBRARIES calamares_viewmodule_packagechooser ${_extra_libraries}
)

3
src/modules/packagechooserq/CMakeLists.txt
View File

@ -39,7 +39,8 @@ option( WITH_APPSTREAM "Support appstream: items in PackageChooser (requires lib
if(WITH_APPSTREAM)
find_package(AppStreamQt)
set_package_properties(
AppStreamQt PROPERTIES
AppStreamQt
PROPERTIES
DESCRIPTION "Support for AppStream (cache) data"
URL "https://github.com/ximion/appstream"
PURPOSE "AppStream provides package data"

12
src/modules/packages/tests/CMakeTests.txt
View File

@ -14,12 +14,16 @@ add_test(
)
add_test(
NAME configure-packages-${_pm}-ops-1
COMMAND env PYTHONPATH=.: python3 ${CMAKE_CURRENT_LIST_DIR}/test-pm-${_pm}.py ${CMAKE_CURRENT_LIST_DIR}/pm-pacman-1.yaml 4 1 1
COMMAND
env PYTHONPATH=.: python3 ${CMAKE_CURRENT_LIST_DIR}/test-pm-${_pm}.py ${CMAKE_CURRENT_LIST_DIR}/pm-pacman-1.yaml
4 1 1
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
add_test(
NAME configure-packages-${_pm}-ops-2
COMMAND env PYTHONPATH=.: python3 ${CMAKE_CURRENT_LIST_DIR}/test-pm-${_pm}.py ${CMAKE_CURRENT_LIST_DIR}/pm-pacman-2.yaml 3 0 0
COMMAND
env PYTHONPATH=.: python3 ${CMAKE_CURRENT_LIST_DIR}/test-pm-${_pm}.py ${CMAKE_CURRENT_LIST_DIR}/pm-pacman-2.yaml
3 0 0
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
@ -32,11 +36,11 @@ if ( BUILD_TESTING AND BUILD_SCHEMA_TESTING AND PYTHONINTERP_FOUND AND PYTHON_EX
if(EXISTS "${_schema_file}" AND EXISTS "${_conf_file}")
add_test(
NAME validate-packages-${_cf}
COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" "${_schema_file}" "${_conf_file}"
COMMAND
${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" "${_schema_file}" "${_conf_file}"
)
else()
message(FATAL_ERROR "Missing ${_conf_file}")
endif()
endforeach()
endif()

1
src/modules/partition/CMakeLists.txt
View File

@ -119,4 +119,3 @@ else()
calamares_skip_module( "partition (missing dependencies for KPMcore)" )
endif()
endif()

26
src/modules/partition/tests/CMakeLists.txt
View File

@ -25,22 +25,17 @@ calamares_add_test(
${PartitionModule_SOURCE_DIR}/jobs/DeletePartitionJob.cpp
${PartitionModule_SOURCE_DIR}/jobs/PartitionJob.cpp
${PartitionModule_SOURCE_DIR}/jobs/ResizePartitionJob.cpp
LIBRARIES
kpmcore
LIBRARIES kpmcore
DEFINITIONS ${_partition_defs}
)
calamares_add_test(
partitionclearmountsjobtest
SOURCES
${PartitionModule_SOURCE_DIR}/jobs/ClearMountsJob.cpp
ClearMountsJobTests.cpp
LIBRARIES
kpmcore
SOURCES ${PartitionModule_SOURCE_DIR}/jobs/ClearMountsJob.cpp ClearMountsJobTests.cpp
LIBRARIES kpmcore
DEFINITIONS ${_partition_defs}
)
calamares_add_test(
partitioncreatelayoutstest
SOURCES
@ -50,26 +45,19 @@ calamares_add_test(
${PartitionModule_SOURCE_DIR}/core/PartitionLayout.cpp
${PartitionModule_SOURCE_DIR}/core/PartUtils.cpp
${PartitionModule_SOURCE_DIR}/core/DeviceModel.cpp
LIBRARIES
kpmcore
Calamares::calamaresui
LIBRARIES kpmcore Calamares::calamaresui
DEFINITIONS ${_partition_defs}
)
calamares_add_test(
partitionautomounttest
SOURCES
${PartitionModule_SOURCE_DIR}/jobs/AutoMountManagementJob.cpp
AutoMountTests.cpp
SOURCES ${PartitionModule_SOURCE_DIR}/jobs/AutoMountManagementJob.cpp AutoMountTests.cpp
DEFINITIONS ${_partition_defs}
)
calamares_add_test(
partitiondevicestest
SOURCES
DevicesTests.cpp
${PartitionModule_SOURCE_DIR}/core/DeviceList.cpp
LIBRARIES
kpmcore
SOURCES DevicesTests.cpp ${PartitionModule_SOURCE_DIR}/core/DeviceList.cpp
LIBRARIES kpmcore
DEFINITIONS ${_partition_defs}
)

15
src/modules/plasmalnf/CMakeLists.txt
View File

@ -10,22 +10,13 @@ find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
set(lnf_ver 5.41)
find_package(KF5Config ${lnf_ver})
set_package_properties(
KF5Config PROPERTIES
PURPOSE "For finding default Plasma Look-and-Feel"
)
set_package_properties(KF5Config PROPERTIES PURPOSE "For finding default Plasma Look-and-Feel")
find_package(KF5Plasma ${lnf_ver})
set_package_properties(
KF5Plasma PROPERTIES
PURPOSE "For Plasma Look-and-Feel selection"
)
set_package_properties(KF5Plasma PROPERTIES PURPOSE "For Plasma Look-and-Feel selection")
find_package(KF5Package ${lnf_ver})
set_package_properties(
KF5Package PROPERTIES
PURPOSE "For Plasma Look-and-Feel selection"
)
set_package_properties(KF5Package PROPERTIES PURPOSE "For Plasma Look-and-Feel selection")
if(KF5Plasma_FOUND AND KF5Package_FOUND)
calamares_add_plugin(plasmalnf

7
src/modules/preservefiles/CMakeLists.txt
View File

@ -14,9 +14,4 @@ calamares_add_plugin( preservefiles
EMERGENCY
)
calamares_add_test(
preservefilestest
SOURCES
Item.cpp
Tests.cpp
)
calamares_add_test(preservefilestest SOURCES Item.cpp Tests.cpp)

8
src/modules/shellprocess/CMakeLists.txt
View File

@ -11,10 +11,4 @@ calamares_add_plugin( shellprocess
SHARED_LIB
)
calamares_add_test(
shellprocesstest
SOURCES
Tests.cpp
LIBRARIES
yamlcpp::yamlcpp
)
calamares_add_test(shellprocesstest SOURCES Tests.cpp LIBRARIES yamlcpp::yamlcpp)

6
src/modules/umount/CMakeLists.txt
View File

@ -12,8 +12,4 @@ calamares_add_plugin( umount
EMERGENCY
)
calamares_add_test(
umounttest
SOURCES
Tests.cpp
)
calamares_add_test(umounttest SOURCES Tests.cpp)

23
src/modules/users/CMakeLists.txt
View File

@ -10,10 +10,7 @@ find_package( Crypt REQUIRED )
set(USER_EXTRA_LIB)
find_package(LibPWQuality)
set_package_properties(
LibPWQuality PROPERTIES
PURPOSE "Extra checks of password quality"
)
set_package_properties(LibPWQuality PROPERTIES PURPOSE "Extra checks of password quality")
if(LibPWQuality_FOUND)
list(APPEND USER_EXTRA_LIB ${LibPWQuality_LIBRARIES})
@ -22,10 +19,7 @@ if( LibPWQuality_FOUND )
endif()
find_package(ICU COMPONENTS uc i18n)
set_package_properties(
ICU PROPERTIES
PURPOSE "Transliteration support for full name to username conversion"
)
set_package_properties(ICU PROPERTIES PURPOSE "Transliteration support for full name to username conversion")
if(ICU_FOUND)
list(APPEND USER_EXTRA_LIB ICU::uc ICU::i18n)
@ -76,14 +70,7 @@ calamares_add_plugin( users
SHARED_LIB
)
calamares_add_test(
userspasswordtest
SOURCES
TestPasswordJob.cpp
SetPasswordJob.cpp
LIBRARIES
${CRYPT_LIBRARIES}
)
calamares_add_test(userspasswordtest SOURCES TestPasswordJob.cpp SetPasswordJob.cpp LIBRARIES ${CRYPT_LIBRARIES})
calamares_add_test(
usersgroupstest
@ -98,9 +85,7 @@ calamares_add_test(
calamares_add_test(
usershostnametest
SOURCES
TestSetHostNameJob.cpp
SetHostNameJob.cpp
SOURCES TestSetHostNameJob.cpp SetHostNameJob.cpp
LIBRARIES
Qt5::DBus # HostName job can use DBus to systemd
)

10
src/modules/usersq/CMakeLists.txt
View File

@ -17,10 +17,7 @@ set( USER_EXTRA_LIB )
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../users)
find_package(LibPWQuality)
set_package_properties(
LibPWQuality PROPERTIES
PURPOSE "Extra checks of password quality"
)
set_package_properties(LibPWQuality PROPERTIES PURPOSE "Extra checks of password quality")
if(LibPWQuality_FOUND)
list(APPEND USER_EXTRA_LIB ${LibPWQuality_LIBRARIES})
@ -30,10 +27,7 @@ endif()
#needed for ${_users}/Config.cpp
find_package(ICU COMPONENTS uc i18n)
set_package_properties(
ICU PROPERTIES
PURPOSE "Transliteration support for full name to username conversion"
)
set_package_properties(ICU PROPERTIES PURPOSE "Transliteration support for full name to username conversion")
if(ICU_FOUND)
list(APPEND USER_EXTRA_LIB ICU::uc ICU::i18n)

21
src/modules/webview/CMakeLists.txt
View File

@ -15,13 +15,8 @@ if ( Qt5Core_VERSION VERSION_LESS 5.6 OR WEBVIEW_FORCE_WEBKIT )
find_package(Qt5 ${QT_VERSION} CONFIG COMPONENTS WebKit WebKitWidgets)
if(Qt5WebKit_FOUND AND Qt5WebKitWidgets_FOUND)
list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES
${QT_QTWEBKIT_INCLUDE_DIR}
)
list( APPEND CALA_WEBVIEW_LINK_LIBRARIES
Qt5::WebKit
Qt5::WebKitWidgets
)
list(APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES ${QT_QTWEBKIT_INCLUDE_DIR})
list(APPEND CALA_WEBVIEW_LINK_LIBRARIES Qt5::WebKit Qt5::WebKitWidgets)
set(WEBVIEW_WITH_WEBKIT 1)
else()
set(_reason "No suitable WebKit")
@ -31,13 +26,8 @@ else()
find_package(Qt5 ${QT_VERSION} CONFIG COMPONENTS WebEngine WebEngineWidgets)
if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES
${QT_QTWEBENGINE_INCLUDE_DIR}
)
list( APPEND CALA_WEBVIEW_LINK_LIBRARIES
Qt5::WebEngine
Qt5::WebEngineWidgets
)
list(APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES ${QT_QTWEBENGINE_INCLUDE_DIR})
list(APPEND CALA_WEBVIEW_LINK_LIBRARIES Qt5::WebEngine Qt5::WebEngineWidgets)
set(WEBVIEW_WITH_WEBENGINE 1)
else()
set(_reason "No suitable WebEngine")
@ -45,8 +35,7 @@ else()
endif()
if(NOT _reason)
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/WebViewConfig.h.in
${CMAKE_CURRENT_BINARY_DIR}/WebViewConfig.h )
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/WebViewConfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/WebViewConfig.h)
calamares_add_plugin(webview
TYPE viewmodule

13
src/modules/welcome/CMakeLists.txt
View File

@ -41,15 +41,6 @@ calamares_add_plugin( welcome
calamares_add_test(
welcometest
SOURCES
checker/GeneralRequirements.cpp
${PARTMAN_SRC}
Config.cpp
Tests.cpp
LIBRARIES
${PARTMAN_LIB}
Qt5::DBus
Qt5::Network
Qt5::Widgets
Calamares::calamaresui
SOURCES checker/GeneralRequirements.cpp ${PARTMAN_SRC} Config.cpp Tests.cpp
LIBRARIES ${PARTMAN_LIB} Qt5::DBus Qt5::Network Qt5::Widgets Calamares::calamaresui
)

5
src/modules/welcomeq/CMakeLists.txt
View File

@ -29,10 +29,7 @@ else()
add_definitions(-DWITHOUT_LIBPARTED)
endif()
set( CHECKER_SOURCES
${_welcome}/checker/GeneralRequirements.cpp
${PARTMAN_SRC}
)
set(CHECKER_SOURCES ${_welcome}/checker/GeneralRequirements.cpp ${PARTMAN_SRC})
calamares_add_plugin(welcomeq
TYPE viewmodule

1
src/modules/zfs/CMakeLists.txt
View File

@ -10,4 +10,3 @@ calamares_add_plugin( zfs
ZfsJob.cpp
SHARED_LIB
)

14
src/qml/calamares/CMakeLists.txt
View File

@ -14,9 +14,10 @@
# and install them into share/calamares/qml/calamares
file(GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*")
foreach(SUBDIRECTORY ${SUBDIRECTORIES})
if( IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}"
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/qmldir" )
if(
IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}"
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/qmldir"
)
set(QML_DIR share/calamares/qml)
set(QML_MODULE_DESTINATION ${QML_DIR}/calamares/${SUBDIRECTORY})
@ -27,13 +28,14 @@ foreach( SUBDIRECTORY ${SUBDIRECTORIES} )
if(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${QML_MODULE_FILE})
configure_file(${SUBDIRECTORY}/${QML_MODULE_FILE} ${SUBDIRECTORY}/${QML_MODULE_FILE} COPYONLY)
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}/${QML_MODULE_FILE}
DESTINATION ${QML_MODULE_DESTINATION} )
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}/${QML_MODULE_FILE}
DESTINATION ${QML_MODULE_DESTINATION}
)
endif()
endforeach()
message("-- ${BoldYellow}Configured QML module: ${BoldRed}calamares.${SUBDIRECTORY}${ColorReset}")
endif()
endforeach()