kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,720 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

273 Commits

Author SHA1 Message Date
Simon Sasburg 05c518b3de FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly. 
This fixes a regression in commit 21123416 where it was trying to better handle
a qmake from Qt5.
 2013-12-06 08:07:38 -07:00
Kitware Robot f051814ed0 Convert builtin help to reStructuredText source files 
Run the convert-help.bash script to convert documentation:

 ./convert-help.bash "/path/to/CMake-build/bin"

Then remove it.
 2013-10-15 14:12:03 -04:00
Brad King 003154f62c Merge topic 'Qt4-INTERFACE_LINK_LIBRARIES' 
0f267c0 FindQt4: Populate the INTERFACE_LINK_LIBRARIES of IMPORTED targets.
 2013-07-26 09:00:56 -04:00
Brad King 86f2d83de3 Merge topic 'fix-FindQt4-available-modules' 
d57c1c1 FindQt4: Re-add QAxServer to the QT_MODULES.
 2013-07-25 08:37:01 -04:00
Stephen Kelly 0f267c012b FindQt4: Populate the INTERFACE_LINK_LIBRARIES of IMPORTED targets. 
This makes the IMPORTED_LINK_INTERFACE_LIBRARIES_<CONFIG> properties
obsolete.
 2013-07-25 13:55:42 +02:00
Stephen Kelly d57c1c1b9e FindQt4: Re-add QAxServer to the QT_MODULES. 
This was removed instead of moved in commit b8af46cb (FindQt4: Don't
fail if certain Qt modules are unavailable.).
 2013-07-24 17:59:13 +02:00
Brad King 49e8c65b92 Merge topic 'fix-FindQt4-available-modules' 
969e7ee FindQt4: Don't use Qt component _FOUND vars before they're defined (#14286)
 2013-07-24 11:02:29 -04:00
Stephen Kelly 969e7ee5df FindQt4: Don't use Qt component _FOUND vars before they're defined (#14286) 
This fixes a regression introduced by commit b8af46cb (FindQt4: Don't
fail if certain Qt modules are unavailable., 2013-05-23)

The _FOUND variable is set by the _QT4_ADJUST_LIB_VARS macro, so
invoke that unconditionally, and guard only the set_property calls,
as described in the original bug report (#14165).
 2013-07-24 10:46:00 -04:00
Stephen Kelly cb7f32f5b8 Mark qt4_use_modules and qt4_automoc as obsolete. 
The QT_QMAKE_EXECUTABLE has to be passed through the cmake calls because
the executable may not be in the PATH.
 2013-07-14 10:05:04 +02:00
Brad King acf42ba325 Merge topic 'find-Qt4-granular-modules' 
b8af46c FindQt4: Don't fail if certain Qt modules are unavailable.
 2013-06-03 09:56:21 -04:00
Stephen Kelly b8af46cb87 FindQt4: Don't fail if certain Qt modules are unavailable. 2013-06-03 09:39:56 -04:00
Brad King 484112d045 Merge topic 'fix-build-without-qt4-with-qt5' 
444e752 FindQt4: Fix QUIET failure with Qt 5 but not Qt 4
 2013-05-21 15:13:21 -04:00
Stephen Kelly 444e752294 FindQt4: Fix QUIET failure with Qt 5 but not Qt 4 
The call

 find_package(Qt4 QUIET)

should be non-FATAL in that case. This fixes #14142.
 2013-05-21 14:52:26 -04:00
Andreas Mohr f57800d6f5 Fix spelling and typos (product names) 
API, Borland, MinGW, UNIX, Mac OS X.
 2013-05-07 08:42:20 -04:00
Andreas Mohr bf019d765d Fix spelling and typos (non-binary) 2013-05-07 08:39:19 -04:00
Brad King 526cbafa4e Merge topic 'findqt4-withqt5' 
252bfd3 FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes.
 2013-03-18 09:42:06 -04:00
Brad King 758651f124 Merge topic 'set-QT_MAJOR_VERSION' 
4aa10cd FindQt4: Set the INTERFACE_QT_MAJOR_VERSION for Qt4::QtCore
 2013-03-18 09:41:50 -04:00
Stephen Kelly 4aa10cd6d6 FindQt4: Set the INTERFACE_QT_MAJOR_VERSION for Qt4::QtCore 
With a similar commit in Qt 5, this will error at CMake time if
an attempt is made to use

 target_link_libraries(foo Qt4::QtCore Qt5::Core)
 2013-03-18 09:31:33 -04:00
Stephen Kelly 28d14f9f13 FindQt4: Set the Qt4_FOUND variable if Qt4 is found 
Provide the old QT4_FOUND for compatibility.
 2013-03-18 09:30:47 -04:00
Clinton Stimpson 252bfd3379 FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes. 2013-03-18 09:06:53 -04:00
Brad King 161a793781 FindQt4: Fix QT_QMAKE{_QMAKE => }_EXECUTABLE typo 
The parent commit accidentally referenced QT_QMAKE_QMAKE_EXECUTABLE
which does not exist.  Use QT_QMAKE_EXECUTABLE instead.

Reported-by: m.hergarden@euphoria-it.nl
 2013-03-13 07:54:36 -04:00
Janne Rönkkö 21123416b4 FindQt4: Do not use qmake from Qt5 
Wihtout this, if qmake binary is from Qt5 the FindQt4 fails even though
the Qt4 version of qmake would be installed as qmake-qt4.

On Archlinux this is the case.

Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
 2013-03-12 13:43:13 -04:00
Stephen Kelly 4d5230d1d8 Only add existing targets to the Qt4 target depends properties. 
Qt can be configured in ways which disable certain modules. Make
sure we don't fail on that.
 2013-02-26 22:03:04 +01:00
Stephen Kelly fde949d143 Don't add target-specific interface includes and defines to Qt 4 targets. 
This is a partial revert of commit c8ee07d0 (FindQt4: Add INTERFACE
includes and defines to Qt4 targets, 2012-12-31).
 2013-02-13 15:12:31 +01:00
Stephen Kelly ba48e63f1e Generate config-specific interface link libraries propeties. 
All other properties we generate are config-specific, so it makes
sense to do so here too.
 2013-02-09 10:25:35 +01:00
Stephen Kelly e3b5eb6b23 Automatically link to the qtmain library when linking to QtCore. 
When using QAxServer, ensure that the qtmain library is excluded
by reporting an error at CMake time if it is not.
 2013-01-23 14:15:41 -05:00
Brad King feb9ffb681 Merge topic 'qt4-target-depends' 
c8ee07d FindQt4: Add INTERFACE includes and defines to Qt4 targets
 2013-01-10 10:22:40 -05:00
Stephen Kelly c8ee07d0ad FindQt4: Add INTERFACE includes and defines to Qt4 targets 2013-01-10 09:44:50 -05:00
Brad King bc414aebaf Merge topic 'qt4-version-openssl' 
4b9ec00 FindQt4: set QT_VERSION_* variables sooner.
 2013-01-08 14:32:22 -05:00
Stephen Kelly 57a67bf27e Qt4: Add module dependencies to the IMPORTED targets 
This means for example, that consumers can use:

 target_link_libraries(foo ${QT_QTGUI_LIBRARIES})

instead of also needing to specify all 'public' dependencies:

 target_link_libraries(foo ${QT_QTGUI_LIBRARIES} ${QT_QTCORE_LIBRARIES} )

when using the IMPORTED targets.  Also populate the
IMPORTED_LINK_DEPENDENT_LIBRARIES property so CMake can help the linker
find shared library dependencies.
 2013-01-07 14:00:47 -05:00
Clinton Stimpson 4b9ec00d0e FindQt4: set QT_VERSION_* variables sooner. 
Set QT_VERSION_* variables sooner so they can be set before
Qt4ConfigDependentSettings.cmake uses them.
 2013-01-07 11:06:35 -07:00
David Cole d73c4057ed Merge topic 'OpenBSD-patches' 
f80ccac OpenBSD: Add paths for Qt3/Qt4
 2012-12-11 13:43:36 -05:00
Amit Kulkarni f80ccac158 OpenBSD: Add paths for Qt3/Qt4 
Handle OpenBSD specific paths in Qt3/Qt4, allowing concurrent building
and installation.  Some common programs are renamed with suffixes of
either 3 or 4.  Also, allow qt3/qt4 installed under /usr/local to be
searched and recognized appropriately.
 2012-12-05 13:09:43 -05:00
Clinton Stimpson 691ac05d40 Qt4: Add SYSTEM option to include_directories. 
Thanks to Scott Bailey and Benjamin Kloster.
 2012-12-03 08:00:07 -07:00
Rolf Eike Beer 8ebf74b02f Find* (and some other): use ${CMAKE_CURRENT_LIST_DIR} in include() 
This solves a lots of warnings, e.g. in the FindModulesExecuteAll test. If the
installed version on the system is rather old this may even lead to bugs, e.g.
https://bugs.gentoo.org/show_bug.cgi?id=436540
 2012-11-04 05:55:37 +01:00
David Cole 5c25df10ac FindQt4: Avoid "finding" non-existent library in a .framework 
...if the library file does not exist inside the .framework then do
not allow a library variable to be set to the path to the framework.
Force set it to NOTFOUND instead.
 2012-09-06 15:11:54 -04:00
Brad King 4f3436dd11 Merge topic 'fix-Qt-casing' 
3252149 Fix casing of 'Qt' in docs, comments and user-visible strings.
 2012-08-30 11:55:36 -04:00
Stephen Kelly 325214900b Fix casing of 'Qt' in docs, comments and user-visible strings. 
QT (cue-tea) is Apple QuickTime.
Qt (cute) is the C++ framework.
 2012-08-28 11:24:55 +02:00
Clinton Stimpson caa9151169 Fix errors detecting Qt4 on Windows 8. 
Thanks to Petr Baloun for the patch.
 2012-08-24 09:54:31 -06:00
David Cole 32710211ad Merge topic 'qt4_use_modules' 
1420691 Add new qt4_use_modules function.
 2012-08-20 15:42:43 -04:00
Stephen Kelly 1420691b35 Add new qt4_use_modules function. 2012-08-19 23:45:09 +02:00
Clinton Stimpson 35c6ae8877 FindQt4: Give precedence to QTDIR environment variable, if set. 
Remove old search paths that aren't needed.

Keep using PATHS instead of HINTS because a Windows machine may have
a different Qt in its PATH and putting QTDIR and the registry entry
ahead of PATH could cause apps to fail when run.
 2012-08-16 07:31:17 -06:00
Clinton Stimpson 5a6a3d4342 FindQt4: Give precedence to QTDIR environment variable, if set. 2012-08-15 18:20:16 -06:00
Clinton Stimpson 4a772a1686 Fix regex for qt minor version. 
Thanks to Dubrovskiy Viacheslav and Sergei Epifanov for patch.
 2012-08-15 18:14:40 -06:00
Kitware Robot 9db3116226 Remove CMake-language block-end command arguments 
Ancient versions of CMake required else(), endif(), and similar block
termination commands to have arguments matching the command starting the
block.  This is no longer the preferred style.

Run the following shell code:

for c in else endif endforeach endfunction endmacro endwhile; do
    echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
egrep -z -v 'Tests/CMakeTests/While-Endwhile-' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
 2012-08-13 14:19:16 -04:00
Kitware Robot 77543bde41 Convert CMake-language commands to lower case 
Ancient CMake versions required upper-case commands.  Later command
names became case-insensitive.  Now the preferred style is lower-case.

Run the following shell code:

cmake --help-command-list |
grep -v "cmake version" |
while read c; do
    echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
 2012-08-13 14:19:16 -04:00
Kitware Robot 7bbaa4283d Remove trailing whitespace from most CMake and C/C++ code 
Our Git commit hooks disallow modification or addition of lines with
trailing whitespace.  Wipe out all remnants of trailing whitespace
everywhere except third-party code.

Run the following shell code:

git ls-files -z -- \
 bootstrap doxygen.config '*.readme' \
 '*.c' '*.cmake' '*.cpp' '*.cxx' \
 '*.el' '*.f' '*.f90' '*.h' '*.in' '*.in.l' '*.java' \
 '*.mm' '*.pike' '*.py' '*.txt' '*.vim' |
egrep -z -v '^(Utilities/cm|Source/(kwsys|CursesDialog/form)/)' |
egrep -z -v '^(Modules/CPack\..*\.in)' |
xargs -0 sed -i 's/ \+$//'
 2012-08-13 14:18:39 -04:00
Rolf Eike Beer 6c8722fab5 Fix typo direcotry -> directory (and similar) [#13444] 2012-07-30 08:08:33 +02:00
Rolf Eike Beer aa841ae3f3 FindQt4: extend documentation 
-refer to AUTOMOC from QT4_AUTOMOC
-mention how source file properties influence QT4_ADD_DBUS_INTERFACE
 2012-06-20 18:31:37 +02:00
David Cole b0a8bc364d Merge topic 'qt4-phonon-backend' 
ad7c80c Added conditional for the phonon backend plugin.
 2012-06-05 14:20:47 -04:00