Age | Commit message (Collapse) | Author |
|
Alex
|
|
Alex
|
|
Instead of testing for it, we can simply use the information provided
by Qt5 config.cmake files
Alex
|
|
Alex
|
|
-reenable the test for visibility in Qt
-reenable the test for FILE_OFFSET_BITS=64 (... there may be maybe some embedded systems where this is not the case ?)
-add -Wl,--disable-auto-import for mingw, we have that in FindKDE4Internal.cmake too
Alex
|
|
Alex
|
|
This patch adds a variable QML_INSTALL_DIR, pointing to the location to
install QtQuick2 imports. These are co-installable with QtQuick 1.x, so
we need both dirs. Naming is consistent with the path, so IMPORT is
ditched from the name (the path doesn't have imports in it anymore).
REVIEW:1088889
|
|
<thiago> that's an C++11-violating option. Time to stop using it.
(and Qt5.1's Q_GLOBAL_STATIC relies on it)
|
|
Alex
|
|
Alex
|
|
This only has an effect with CMake 2.8.11.
|
|
This will only have an effect with CMake 2.8.11, but until then,
it does no harm.
|
|
|
|
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
|
|
Alex
|
|
And qt plugins from lib/kde5/plugins to lib/plugins.
|
|
There was no reason to add more flags only on Linux/Hurd; in fact, in
kdelibs' FindKDE4Internal.cmake there's also a block with similar
settings for the BSDs.
Make it more general by removing the system checks before setting
these flags. -Wno-long-long is particularly needed when one is
building code with -pedantic (see picmi, for example).
CCMAIL: kde-buildsystem@kde.org
|
|
In preparation for making having the default CXXFLAGS available on all
systems using GCC instead of only Linux/Hurd, remove -ansi from the
CXXFLAGS.
strtoll(3), used, for example, in kdelibs, is part of C99; -ansi means
GCC will switch to C89 and C++98, which breaks things on systems such
as FreeBSD. It worked on glibc-based systems because libstdc++ always
defines _GNU_SOURCE on Linux, which ends up enabling additional
features.
This change should not break existing code, as dropping -ansi actually
means being less strict than before.
Discussed in the kde-buildsystem mailing list [1].
[1] http://lists.kde.org/?t=134482883000001&r=1&w=2
CCMAIL: kde-buildsystem@kde.org
|
|
It is not completely clear why this flag was being specified in the
first place: it was added in the commit that created
FindKDE4.cmake (KDE SVN r497283), and seems to have been ported
automatically from the autotools code.
In autotools, its origins can be tracked back to KDE SVN r141814,
which was a libtool update. In that case, -lc was only passed on AIX
systems anyway.
|
|
This macro only makes sense on glibc-based systems, which honour that
definition according to feature_test_macros(7).
|
|
|
|
Alex
|
|
- we need to make sure that the install dir we are looking at is an absolute path
- there was a typo in one of the variable names, it was never right
Alex
|
|
As discussed, remove the LIBRARY_TYPE cmake variable and
put BUILD_SHARED_LIBS instead into the cache, set to TRUE.
So if somebody wants to build a static library, and the project
allows it (by not explicitely using "STATIC" in add_library()), he
can switch this variable to FALSE in the cache.
Also, put the ARCHIVE library component into the Devel install component,
static libs and Windows lib files belong to the development package.
Use newer write_basic_package_version_file() instead of older write_basic_config_version_file(),
which are identical beside the name
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
|
|
|
|
|
|
including applying fixes I made to FindKDE4Internal but got lost in the
conversion:
* Use XDG dir for config files
* Make the "data" resource point to share rather than share/apps, in order
to match XDG_DATA_DIRS and QStandardPaths::GenericDataLocation.
Also, move autostart to the xdg path (etc/xdg/autostart).
|
|
Alex
|
|
Alex
|
|
ECMQtFramework.cmake now uses
- KDEInstallDirs.cmake, so it doesn't have to define th install locations itself anymore
- KDECompilerSettings.cmake, so it gets the full set we had in kdelibs4
- KDECMakeSettings, so it gets the full set of cmake features as before, and some more, RPATH, etc.
Alex
|
|
Alex
|
|
CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES to the RPATH
Alex
|
|
Alex
|
|
Alex
|
|
-make some endif()s empty
-set the linker flags on Linux in one step, not in two
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
|