484112d045
Merge topic 'fix-build-without-qt4-with-qt5'
...
444e752
2013-05-21 15:13:21 -04:00
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
f57800d6f5
Fix spelling and typos (product names)
...
API, Borland, MinGW, UNIX, Mac OS X.
2013-05-07 08:42:20 -04:00
bf019d765d
Fix spelling and typos (non-binary)
2013-05-07 08:39:19 -04:00
526cbafa4e
Merge topic 'findqt4-withqt5'
...
252bfd3
2013-03-18 09:42:06 -04:00
758651f124
Merge topic 'set-QT_MAJOR_VERSION'
...
4aa10cd
2013-03-18 09:41:50 -04:00
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
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
252bfd3379
FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes.
2013-03-18 09:06:53 -04:00
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
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
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
fde949d143
Don't add target-specific interface includes and defines to Qt 4 targets.
...
This is a partial revert of commit c8ee07d0
2013-02-13 15:12:31 +01:00
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
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
feb9ffb681
Merge topic 'qt4-target-depends'
...
c8ee07d
2013-01-10 10:22:40 -05:00
c8ee07d0ad
FindQt4: Add INTERFACE includes and defines to Qt4 targets
2013-01-10 09:44:50 -05:00
bc414aebaf
Merge topic 'qt4-version-openssl'
...
4b9ec00
2013-01-08 14:32:22 -05:00
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
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
d73c4057ed
Merge topic 'OpenBSD-patches'
...
f80ccac
2012-12-11 13:43:36 -05:00
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
691ac05d40
Qt4: Add SYSTEM option to include_directories.
...
Thanks to Scott Bailey and Benjamin Kloster.
2012-12-03 08:00:07 -07:00
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
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
4f3436dd11
Merge topic 'fix-Qt-casing'
...
3252149
2012-08-30 11:55:36 -04:00
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
caa9151169
Fix errors detecting Qt4 on Windows 8.
...
Thanks to Petr Baloun for the patch.
2012-08-24 09:54:31 -06:00
32710211ad
Merge topic 'qt4_use_modules'
...
1420691
2012-08-20 15:42:43 -04:00
1420691b35
Add new qt4_use_modules function.
2012-08-19 23:45:09 +02:00
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
5a6a3d4342
FindQt4: Give precedence to QTDIR environment variable, if set.
2012-08-15 18:20:16 -06:00
4a772a1686
Fix regex for qt minor version.
...
Thanks to Dubrovskiy Viacheslav and Sergei Epifanov for patch.
2012-08-15 18:14:40 -06:00
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
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
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
6c8722fab5
Fix typo direcotry -> directory (and similar) [ #13444 ]
2012-07-30 08:08:33 +02:00
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
b0a8bc364d
Merge topic 'qt4-phonon-backend'
...
ad7c80c
2012-06-05 14:20:47 -04:00
ad7c80cd9f
Added conditional for the phonon backend plugin.
...
If on APPLE, the phonon backend plugin is set to phonon_qt7. If on WIN32, the phonon backend plugin is set to phonon_ds9. I did not add any for generic UNIXes as they could have a whole host of things. A more comprehensive script would actually attempt to detect which phonon plugins were installed. However, this is a simple fix for now that will work for most people.
2012-05-29 14:56:07 -06:00
37a28ffa36
Fix the number variable comparison when Qt is not found.
2012-05-03 17:40:04 +02:00
1dfe15c431
Abort FindQt4.cmake if Qt 5 is found.
2012-05-03 16:47:07 +02:00
cbdfcc6515
FindQt4: clarify warning message about incorrect Qt installation.
...
Fixes bug #12915 .
Thanks Laurent Rineau and Brad King for input.
2012-02-08 18:40:55 -07:00
cf4b52980d
Add QT_LIBRARIES_PLUGINS variable to UseQt4.
2011-10-03 11:01:39 -06:00
a67be31784
qt4: also find QtUiTools when cross compiling with mingw.
2011-08-29 08:23:44 -06:00
de30173d5b
Remove C compiler requirement from FindQt4.cmake
...
Use the new check_cxx_symbol_exists instead of check_symbol_exists.
Also remove a debug message from CheckSymbolExists.cmake.
2011-07-28 12:15:46 -06:00
df7a95629c
Merge topic 'qt4-apple-framework-fix'
...
702538e
2011-07-26 14:57:48 -04:00
702538eaa3
Qt4: Fix reference of undefined variable when detecting frameworks on Mac OS X
2011-07-25 12:30:30 -06:00
0ae8a3405b
Add qt4/QtCore to help find Qt headers when cross-compiling.
2011-07-22 13:38:36 -06:00
e7f05d9759
Add imported targets support for frameworks on Mac.
2011-06-13 17:21:41 -06:00
Brad King
Stephen Kelly
Andreas Mohr
Clinton Stimpson
Janne Rönkkö
David Cole
Amit Kulkarni
Rolf Eike Beer
Kitware Robot
Kurtis Nusbaum
David Faure
Mike McQuaid