Age | Commit message (Collapse) | Author |
|
This makes it convenient to make further modifications to the tests,
such as setting properties on either the tests or the targets.
CHANGELOG: New arguments for ecm_add_tests().
BUG: 345797
REVIEW: 123841
|
|
ecm_add_test is the less useful (and less used) version of the functions
(because you really might as well just use add_executable() and
add_test() manually in that case).
REVIEW: 123841
|
|
This reverts commit 0c224194ea7f12eaed32af746fc9138537f1919c.
Stephen Kelly pointed out that this is probably not the best approach to
the problem, and runs counter to the direction KDE's CMake code has been
going (splitting functions up and using CMake built-ins where possible).
I have a better solution in mind, which I'll post a review for later.
CCMAIL: kde-buildsystem@kde.org
CCBUG: 345797
|
|
This is particularly useful with ecm_add_tests, where you may want to
force a suite of tests to run in serial, or alter the timeout for
multiple tests at once.
BUG: 345797
REVIEW: 123722
|
|
REVIEW: 123722
|
|
According to Oswald Buddenhagen "it doesn't buy much, and there are
some long-standing issues with it".
Qt bug report: https://bugreports.qt.io/browse/QTBUG-44362
REVIEW: 122501
|
|
Through a quirk of implementation, old-style icon filenames are accepted
by the new-style ecm_install_icons function. It's too late to change it
now, as that would break existing projects, but we can warn about it.
REVIEW: 122941
|
|
Qt5LinguistToolsConfig.cmake defines CMake target for lconvert since Qt 5.3.1,
so we should use that if it is available.
Our own hacks were not working in some configurations (i.e. when there is
/usr/bin/lconvert managed by qtchooser, but no qtchooser configuration file).
REVIEW: 122626
|
|
In particular, strongly recommend looking at the equivalent CMake
documentation with regard to PATH_VARS, as a lot of projects that should
be making use of it are not.
|
|
REVIEW: 122317
Thanks alexmerry and dvratil for review
|
|
|
|
Three modules (ECMCoverageOption, ECMEnableSanitizers and
ECMGeneratePkgConfigFile) were not being documented. This commit fixes
that situation.
|
|
|
|
This is basically just the code available on the CMake FAQ item about
`make uninstall`, but packaged up in a convenient module.
REVIEW: 122359
|
|
|
|
This reverts commit 959c374c022394a116e8ceb2b1fce2df11752068.
I merged and pushed the wrong branch.
|
|
SameMajorVersionWithPreleases is intended implement the versioning
scheme followed by many KDE projects: minor releases after some high
number (eg: 90) are considered to be pre-releases of the next major
version, and are not compatible with the current major version. This
allows alpha and beta releases to be ordered correctly by
version-number-aware software like package managers (an alpha of version
2 should have a higher number than any release of version 1, but less
than version 2.0).
So a request for version 2.1.0 of a piece of software should not be
satisfied by 2.93.4, because that is actually a pre-release of version
3. On the other hand, a request for version 2.91.0 should be satisfied
by version 3.1.0.
Note that prereleases are not considered unless explicitly requested, so
2.93.4 will not satisfy requests for version 3 (or version 2) of a piece
of software.
|
|
This adds an application icon to an executable from PNG files for
Windows and Mac OS X. Unlike the similar kde4_add_app_icon macro from
kdelibs, this requires icons to be explicitly listed as arguments
(meaning CMake can tell when ones are added or deleted and reconfigure
as appropriate), and it works with Matthias Benkmann's png2ico tool, as
well as the KDE-Win tool of the same name.
Currently missing unit tests. Also completely untested (except that
`make test` runs on Linux, so there are no obvious syntax errors).
With thanks to Ralf Habacker for the inital work on porting
kde4_add_app_icon.
CHANGELOG: Add ECMAddAppIcon module to add icons to executable targets
on Windows and Mac OS X.
|
|
With CMake 3.1, @-style variable expansion is deprecated outside of
configure_file() or string(CONFIGURE) contexts (CMP0053). This causes
ecm_generate_pri_file() to produce dev warnings with this verison of
CMake, and would break this function in projects that set CMake 3.1 as
their required version.
REVIEW: 121971
|
|
|
|
Lots of libraries will want to use SameMajorVersion to make sure
searching for version 1 of a library doesn't give you version 2, for
example.
We may want to add another, custom compatibility mode for
KDE Frameworks-style versioning, where version x.90.z to x.99.z are
alpha/beta releases for version (x+1).
REVIEW: 121696
|
|
81627ad86d3d7d5e5a7d130dfc746d5b1b58cbe7 broke the case where Qt5 qmake
is not in the path or not called qmake-qt5, because it stopped using the
location of qmake as provided by the Qt5Core CMake module when found.
|
|
The wrong syntax for set() was being used. This change also allows
QMAKE_EXECUTABLE to be used to override the qmake path even when the
Qt5Core CMake module is found.
|
|
REVIEW: 120655
|
|
GIT_SILENT
|
|
We were keeping the \n after the path, and it would crash in some
places. Strip the whitespaces in both ends.
Reviewed by Rohan Garg
|
|
KDE modules cannot assume the normal ECM modules are in the CMake module
path, and CMAKE_INSTALL_IMPORTS_INSTALL_DIR / QTQUICKIMPORTSDIR was not
set correctly. Also, ECMQueryQmake.cmake used a deprecated CMake command
(exec_program).
|
|
Introduces a BUILD_COVERAGE option from a ECMCoverageOption file so that
projects can easily enable code coverage in their applications.
Furthermore, KDECompilerSettings does include that by default, so all
proper KDE projects have the option by default.
REVIEW: 120118
|
|
REVIEW: 119968
|
|
A new module has been introduced to generate pkgconfig files from
cmake projects.
REVIEW: 119798
|
|
|
|
Packagers and other interested folks should pass -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
when building in order to install various files to the same dir as the Qt5 install
dirs.
CCMAIL: kde-packagers@kde.org
REVIEW: 119901
|
|
Otherwise, if lconvert exists in normal system paths (eg. /usr/bin) that one
will be used instead of the one alongside Qt5::lrelease. This could cause Qt4
lconvert to be incorrectly used on some systems.
REVIEW: 119198
|
|
|
|
|
|
|
|
|
|
David Faure and Patrick Spendrin have convinced me that NAME_PREFIX
should be informational only, and not be used to prevent clashes, since
it makes things confusing when you run tests manually.
This is a SIC change (although in practice only kio and kconfig should
be affected, currently).
REVIEW: 118768
CCMAIL: kde-frameworks-devel@kde.org
CCMAIL: kde-buildsystem@kde.org
|
|
REVIEW: 118216
|
|
This reverts commits
b90b64632f46e929f26ab9a4ee0033478febe0eb
ba8600088b8838d5453dd0990ec595e904ec216e
554be62af6d0f01049985076b2445229bae41816
These were causing configure failures in frameworks that use
ECMAddTests.
CCMAIL: ps_ml@gmx.de
CCMAIL: kde-frameworks-devel@kde.org
|
|
|
|
|
|
|
|
ecm_create_qm_from_po_files() was actually not very useful in practice.
So that is deprecated, to be removed before ECM 1.0.
Instead, the ECMPoQmTools provides several useful functions:
ecm_create_qm_loader() (which already existed in
ECMCreateQmFromPoFiles), ecm_process_po_files_as_qm() (which has the
same signature as gettext_process_po_files() from the FindGettext
module) and ecm_install_po_files_as_qm(), which is a convenience
function mostly for the benefit of KDE Frameworks (although potentially
useful for whatever other projects have the unusual requirement of a
Gettext translation workflow but no Gettext usage in the code).
NB: some clean-up to the documentation was done by Alex Merry
<alex.merry@kde.org> as part of this commit.
REVIEW: 117823
|
|
in the path
|
|
cmake_policy() does not allow you to reference policies that do not yet
exist, so include a version check.
|
|
ecm_dbus_add_activation_service() requires suffient knowledge of its
internals to use that replacing two lines with one seems silly.
In order to use it you have to know it behaves like configure_file()
(because you have to construct the file yourself), except that it also
installs it somewhere (for which you have to make sure
DBUS_SERVICES_INSTALL_DIR is defined before you use it, which is
certainly not a given for non-KDE projects). By this point, why not just
use configure_file() and install()? The DBUS_SERVICES_INSTALL_DIR
provided by KDEInstallDirs is all the magic you actually need, and if
that's explicit in the CMakeLists.txt file, it's a lot more obvious that
you should have it defined somewhere.
REVIEW: 117581
|
|
ECMUseFindModules allows find modules to be copied to a local directory.
These find modules may use ECMFindModuleHelpers, but they will not be in
the same relative location to ECMFindModuleHelpers.cmake and there is no
guarantee that ECMFindModulesHelpers.cmake will be in the CMake module
path.
To solve this, we make sure there is always a stub file in the same
directory as the find modules that includes the real
ECMFindModuleHelpers.cmake. The one installed with ECM just includes
"../modules/ECMFindModuleHelpers.cmake", while ecm_use_find_modules
generates a stub that uses an absolute path.
REVIEW 117658
|
|
When CMake policy CMP0048 (CMake 3.0) is set to NEW, the project()
command is meant to manage the project's version variables. We therefore
do not set the PROJECT_VERSION variables in this case.
To make sure projects do not have to specify their version in multiple
places, this also allows the keyword "PROJECT" to be passed to
ecm_setup_version instead of an actual version number. In this case, the
version passed to project() will be used.
REVIEW: 117619
|
|
This requires the icon files to be specified (which is better than
globbing, because the build system will then be able to tell when files
are added or removed and re-run CMake).
It also removes the theme name from the filename pattern: the old code
used a shorthand theme name for a small number of themes, and didn't
allow any other themes. Extending this to arbitrary themes could cause
problems with themes that have numbers or hyphens (or whatever other
delimiter character was used) in their names. Most users are likely to
just want to install to a single theme anyway (based on a random
sampling of users of kde4_install_icons), so that is what the new syntax
requires.
The old syntax still works and behaves as before.
ecm_update_iconcache is renamed to _ecm_update_iconcache - it was never
documented as public API anyway.
REVIEW: 117617
|