Age | Commit message (Collapse) | Author |
|
|
|
|
|
While the tests in ECM are not "built" as such (at least, not until they
are run), disabling the tests might be desirable to avoid the compiler
checks and to make the whole build process architecture-independent.
REVIEW: 118498
|
|
Setting the language for ECM's project() call to C had unanticipated
side-effects - notably that the installed version file required the
architecture to match the one used at build time.
Instead, we make the tests a sub-project, setting up C as the language
there (since most of the tests do use C, albeit slightly indirectly).
REVIEW: 118498
|
|
|
|
Although ECM does not make use of a compiler directly, the language
affects the search path for CMake packages; in particular, a package
installed to /usr/lib64/cmake will not be found if NONE is passed as the
language argument to project(). This meant that a 64-bit version of
Qt5LinguistTools would not be found on systems where 64-bit libraries
are not installed in the "default architecture" location (/usr/lib).
With this change, the configure step performs some otherwise-unnecessary
tests. We minimise this by explicitly specifying the C language (which
is also what some of the tests use), rather than letting it be the
default (which is C and C++).
REVIEW: 118374
|
|
|
|
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.
|
|
|
|
|
|
|
|
It does not work with CMake master.
|
|
As agreed.
CCMAIL: kde-frameworks-devel@kde.org
|
|
This reverts commit 53679542f663dc74276b928e8749b082319826f4.
Since no language has been enabled, the file generated by
write_basic_package_version_file does not care about the
architecture
|
|
|
|
REVIEW: 112713
|
|
-increase version to 0.0.9
-install to a non-versioned directory
Alex
|
|
|
|
|
|
|
|
-port to CamelCased KF5 libs
-add some documentation to FindKF5.cmake
-get rid of KDEDIRS, introduce KF5_DIRS instead, a cmake-only variable, as supported by many Find-modules
Alex
|
|
- added some docs
- now a KF5_INCLUDE_DIRS variable is set, containing all requested include dirs
- the same for KF5_LIBRARIES
- some more status reporting
Alex
|
|
This commit
-adds the macro ecm_setup_version(), as proposed on the kde-frameworks list
-sets CMAKE_INSTALL_DEFAULT_COMPONENT_NAME to ${PROJECT_NAME} if a project has been set
-makes e-c-m require cmake 2.8.10.1
Alex
|
|
extra-cmake-modules is not a command, so it should not be in section 1
of the man pages. Section 7 (miscellanea) seems most appropriate.
REVIEW: 105188
|
|
kdelibs for the new file ECMWriteVersionHeader.cmake)
Alex
|
|
|
|
-rename the cmake package from extra-cmake-modules to ECM
-change variable names and docs accordingly
-move setting of Qt-related defines from ECMQtFrameworks.cmake to KDECompilerSettings.cmake
-remove ECMSetVersionVariables.cmake, we'll do it some other way
-rename ECMConfig.cmake.in to ECMQtFrameworkConfig.cmake.in, since this is where it is used, and it would have the same name as ECMConfig.cmake.in which is for extra-cmake-modules itself
Alex
|
|
Alex
|
|
settings from FindKDE4Internal.cmake
This is not done yet.
It currently depends on cmake git master.
All the places where I'm not sure I added a "TODO".
Alex
|
|
KDEInstallDirs.cmake is similar to GNUInstallDirs.cmake coming with cmake,
but provides the install variables as used by KDE.
It also provides the special feature of initializing them to the values from kdelibs (?)
when installed into the same prefix.
Currently it all still uses "kde4", I'm not sure this will stay this way.
Alex
|
|
Alex
|
|
-add test ExecuteAllModules, which is the same as FindModulesExecuteAll in CMake: include (and execute) all *cmake files, to make sure they are not completely broken
Alex
|
|
find-modules coming with e-c-m
Alex
|
|
they can be handled differently (the macros can't clash with stuff from cmake, since they all have the ECM prefix)
Alex
|
|
Alex
|
|
Alex
|
|
|
|
|
|
Alex
|
|
Alex
|
|
Alex
|
|
Alex
|
|
Alex
|
|
Alex
CCMAIL: kretz@kde.org
svn path=/trunk/KDE/kdelibs/; revision=834705
|
|
Alex
CCMAIL: kde-buildsystem@kde.org
CCMAIL: kretz@kde.org
svn path=/trunk/KDE/kdelibs/; revision=829250
|
|
from kdelibs.
In a few weeks automoc4 from kdesupport will be required.
Alex
CCMAIL: kretz@kde.org
svn path=/trunk/KDE/kdelibs/; revision=806300
|
|
I replaced kde4automoc.cmake with a C++/QtCore based program that can run more
efficient.
Instead of creating a <targetname>.automoc file that is added to the target I
create a <targetname>_automoc.cpp file now that is compiled and linked into
the target. This file #includes all moc files that are not included by other
source files. This way the automoc can, at make-time, decide what mocs need
to be compiled explicitly and linked into the target.
E.g. the following is possible now:
foo.h:
class A : public QObject
{
Q_OBJECT
...
};
foo.cpp does not #include "foo.moc"
run make - everything compiles and links fine (without mentioning the header
in KDE4_MOC_HEADERS either since the new automoc looks at all corresponding
header files from the .cpp files by itself)
now change foo.cpp to #include "foo.moc"
running make now will just work, even with the /fast target.
Next change I did was to create a <targetname>_automoc.cpp.files file to pass
the moc includes and the source files that belong to the target to the
automoc. I could have kept it on the command line but I got a report that the
command line was already too long for Windows' cmd.exe.
Implementation details:
- The messages of the automoc are written using cmake -E cmake_echo_color, so
the automoc correctly colorizes its messages now.
- The moc QProcesses are started in parallel (up to 10).
svn path=/trunk/KDE/kdelibs/; revision=685719
|
|
a good name for the variable)
-add install rules for the cmake files in kdelibs/cmake/modules/
-remove debug output and fix typo in FindOpenEXR.cmake
Alex
svn path=/trunk/KDE/kdelibs/; revision=510319
|