aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-26Improve installation directories naming for services and servicetypesAleix Pol
kde5/services is kservices5 kde5/servicetypes is kservicestypes5
2014-04-26Provide a KF5_DATA_INSTALL_DIR variableAlex Merry
This provides versioning in a way that is simple to update for KF6, and reduces our footprint in /usr/share.
2014-04-26Remove KF5 suffix from INCLUDE_INSTALL_DIR default valueAlex Merry
Only frameworks should be installing in include/KF5. They use KF5_INCLUDE_INSTALL_DIR, which has the KF5 suffix, while other code should install to just include (or a subdirectory of their choice).
2014-04-26Add KF5_INCLUDE_INSTALL_DIR variable to KDEInstallDirsAlex Merry
Currently, this is the same as INCLUDE_INSTALL_DIR, but INCLUDE_INSTALL_DIR will lose the "KF5" suffix once the frameworks are changed to use KF5_INCLUDE_INSTALL_DIR. Because INCLUDE_INSTALL_DIR is used in INSTALL_TARGETS_DEFAULT_ARGS, there is now also a KF5_INSTALL_TARGETS_DEFAULT_ARGS.
2014-04-26Fix python error in ecm sphinx moduleAlex Merry
The ecm sphinx module occasionally tried to modify a list it was iterating over, which is a Bad Thing and raised an exception on the third or so time it was run without clearing the build directory.
2014-04-26Add a FindKF5.cmake moduleAlex Merry
REVIEW: 117780
2014-04-25Fix ecm_setup_version() with CMake 2.8.12.xAlex Merry
cmake_policy() does not allow you to reference policies that do not yet exist, so include a version check.
2014-04-25Remove ECMDBusAddActivationService moduleAlex Merry
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
2014-04-25Split up module execution testsAlex Merry
Find module tests now use find_package(), and there is a version for when CMAKE_MODULE_PATH is set and a version for when ecm_use_find_modules() is used. KDE modules are also now tested. REVIEW 117658
2014-04-25Add a stub for ECMFindModuleHelpers to the find-modules dirAlex Merry
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
2014-04-25Make ecm_setup_version interact well with CMP0048Alex Merry
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
2014-04-25New syntax for ecm_install_icons()Alex Merry
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
2014-04-25ECMGeneratePriFile: Allow lib and include install dirs to be overriddenAlex Merry
Rather than blindly using ${LIB_INSTALL_DIR} and ${INCLUDE_INSTALL_DIR} (which assume the inclusion of KDEInstallDirs), this checks whether they exist, also checks for ${CMAKE_INSTALL_LIBDIR} and ${CMAKE_INSTALL_INCLUDEDIR} (set by GNUInstallDirs), provides hard-coded defaults and allows arguments to be used to override the values. This should make it useful to projects that aren't KDE Frameworks. REVIEW: 117593
2014-04-25ECMFindModuleHelpers: set traditional variablesAlex Merry
The traditional *_LIBRARIES, *_INCLUDE_DIRS and *_DEFINITIONS do have some uses - they make it easier to create package config files that use found libraries in their link interface. So this makes sure these variables are set by ecm_find_package_handle_library_components() (and hence by FindWayland.cmake and FindXCB.cmake). REVIEW: 117585
2014-04-24Rework FindX11_XCB.cmakeAlex Merry
Imported target, version handling, package description etc. REVIEW: 117491
2014-04-23Only search for qttools if ECM_CREATE_QM_FROM_PO_FILES is called.Nicolás Alvarez
This means frameworks will only depend on qttools if you have a po directory when building them. Approved by agateau and alexmerry on IRC.
2014-04-22Improve plural handling for code using Qt translation systemAurélien Gâteau
- Always load "en" translation: This way if a plural string is not translated, we fallback to the correct english plural form. - Generate .ts files with correct plural settings REVIEW: 117629
2014-04-20Improve the manualsAlex Merry
This adds an ecm-developer manual that replaces writing-find-modules.md (a lot of which was upstreamed to CMake's own documentation). It also adds introductory text to the ecm-*-modules manuals.
2014-04-18Make documentation generation python3 compatibleUwe L. Korn
REVIEW: 117624
2014-04-16Allow ecm_create_qm_loader() to be passed the _SRCS variableAlex Merry
This allows a more straightforward way of using it, which matches the macros that generate things like D-Bus interfaces. REVIEW: 117475
2014-04-16ECMCreateQmFromPoFiles: Also check CMAKE_INSTALL_LOCALEDIRAlex Merry
This is the variable set by GNUInstallDirs. REVIEW: 117596
2014-04-16Make ECMCreateQmFromPoFiles usable from within trunk/l10n-kf5Aurélien Gâteau
REVIEW: 117560
2014-04-15Add TODOs to KDEInstallDirs.cmakeAlex Merry
2014-04-14Improve FindEGL.cmakeAlex Merry
- Add version handling - Improve the docs - mark cache variables as advanced - make the pkg-config call actually work REVIEW: 117490
2014-04-11Be more verbose about searching for SphinxAlex Merry
2014-04-11Add documentation generation using SphinxAlex Merry
This is deliberately modelled very closely on CMake's documentation system. It's a hefty patch, because it involved changing all the documentation to be in reStructuredText format. I also cleaned up the copyright/license statements at the same time. Note that the find modules contain the full license, due to the fact that ecm_use_find_module() copies them out of the ECM distribution.
2014-04-01Do not replace "-" with "_" in .po filesAurélien Gâteau
This causes problem with .po files whose name contains "-". A nice side effect of this approach is we pass a QLocale to QTranslator, which means it will try to load translations for all "ui languages" [1] instead of just the one returned by QLocale::name(). [1]: http://doc-snapshot.qt-project.org/qt5-stable/qlocale.html#uiLanguages REVIEW: 117296
2014-03-28beta1 preparation: ECM is now 0.0.12v0.0.12David Faure
2014-03-28Add ECMCreateQmFromPoFiles.cmakeAurélien Gâteau
Simplifies translation handling for frameworks using Qt translation system. REVIEW: 117052
2014-03-27Print module name for not found dependend componentMartin Gräßlin
Always printed Wayland. REVIEW: 117114
2014-03-17Create ECMFindModuleHelpers module for common find-module codeAlex Merry
This currently mostly contains macros for handling components; FindWayland and FindXCB are ported to use this module, which comes with various improvements for them. REVIEW: 116653
2014-03-17Add historical info to comments in the compiler settings hacksAlex Merry
Hopefully these might be of some use in determining whether they are still needed.
2014-03-11Import FindOpenEXR.cmake from kimageformatsAurélien Gâteau
The thumbnail: ioslave from kde-runtime needs it. Reviewed-By: Alex Merry
2014-03-11Fix over-zealous search-and-replace in the docsAlex Merry
2014-03-11Add documentation about writing find modulesAlex Merry
REVIEW: 116025
2014-03-07Make the required CMake version in the ExecuteAllModules test 2.8.12Alex Merry
This matches what is in the main CMakeLists.txt file, and silences some warnings in the test logs.
2014-03-06Remove unused find-modules back to the atticAlex Merry
REVIEW: 116616
2014-03-05Check versions for individual componentsAurélien Gâteau
First part of the diff makes sure find_package_handle_standard_args() gets a version number to check against. Second part ensures we get proper results from pkg-config even if not all components are available. find_package(Wayland COMPONENTS Client Egl) was failing for me because I have Client installed but not Egl, causing pkg_check_modules() to not set any PKG_Wayland_${comp} variable. REVIEW: 116598
2014-03-04Also pass -fno-exceptions when building with clangAlex Richardson
All of KF5 + kate + kde-workspace compile with clang and -fno-exceptions The only problem related to clang and -fno-exceptions I could find was http://llvm.org/bugs/show_bug.cgi?id=10910 and that is fixed since clang version 3.0 which was released in December 2011 REVIEW: 115395
2014-03-02find_dependency: Update to match CMake's versionAlex Merry
Specifically, we namespace the variables to avoid conflicts, and make the version argument optional. REVIEW: 116080
2014-03-01alpha2 preparation: ECM is now 0.0.11v0.0.11David Faure
2014-02-25Remove FindDocBook*.cmakeAlex Merry
These are only really useful to kdoctools, so they may as well live there. REVIEW: 115897
2014-02-25Improve FindXCBMartin Gräßlin
* define imported targets for all components * add version information * print message on Windows * add package properties * use handle components REVIEW: 116046
2014-02-25Add a FindWayland moduleMartin Gräßlin
Inspired by the FindXCB module it's using components to simplify finding just the parts which are really required. REVIEW: 116018
2014-02-25Add a FindEGL moduleMartin Gräßlin
This module finds the egl library through pkg-config. REVIEW: 116014
2014-02-21Defer to CMake's find_dependency macro if it existsAlex Merry
This will be available in CMake 3.0.0. This way, we automatically pick up any new features from it. REVIEW: 115775
2014-02-19Remove CMakePackageConfigHelpers.cmakeAlex Merry
All the frameworks are ported now, so this is no longer necessary. Checked by building everything with kdesrc-build.
2014-02-18Simplify argument parsing for ecm_generate_headersAlex Merry
Now that we no longer have to support the old syntax, some of the more complex bits of the argument parsing can be removed. REVIEW: 115869
2014-02-18Rename CMakePackageConfigHelpers to ECMPackageConfigHelpersAlex Merry
Overriding a CMake package like this will just cause all sorts of headaches later on. In this particular case, projects that depended on CMake 2.8.13 or later (more likely 3.0.0) would fail with a message about removing the CMakePackageConfigHelpers file, but would have no way to do that while still using ECM. This also renames the configure_package_config_file() macro to ecm_configure_package_config_file(), so that anything including CMakePackageConfigHelpers afterwards does not overwrite the macro unexpectedly. For now, we keep a CMakePackageConfigHelpers.cmake file that just wraps ecm_configure_package_config_file() as configure_package_config_file() to keep the frameworks building while they are ported. REVIEW: 115496 Reviewed by Sune Vuorela <kde@pusling.com>
2014-02-16remove old syntax, now that everything has been ported to the new oneDavid Faure
[at least everything that kdesrc-build builds. If there's something else, then it should be added to kdesrc-build...]