reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-29 06:20:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
20,586 Commits 4 Branches 185 Tags 113 MiB
4d5230d1d8
Commit Graph

251 Commits

Author SHA1 Message Date
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
Kurtis Nusbaum
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
Stephen Kelly
37a28ffa36 Fix the number variable comparison when Qt is not found. 2012-05-03 17:40:04 +02:00
David Faure
1dfe15c431 Abort FindQt4.cmake if Qt 5 is found. 2012-05-03 16:47:07 +02:00
Clinton Stimpson
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
Mike McQuaid
cf4b52980d Add QT_LIBRARIES_PLUGINS variable to UseQt4. 2011-10-03 11:01:39 -06:00
Clinton Stimpson
a67be31784 qt4: also find QtUiTools when cross compiling with mingw. 2011-08-29 08:23:44 -06:00
Clinton Stimpson
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
Brad King
df7a95629c Merge topic 'qt4-apple-framework-fix' 
702538e Qt4: Fix reference of undefined variable when detecting frameworks on Mac OS X
 2011-07-26 14:57:48 -04:00
Clinton Stimpson
702538eaa3 Qt4: Fix reference of undefined variable when detecting frameworks on Mac OS X 2011-07-25 12:30:30 -06:00
Clinton Stimpson
0ae8a3405b Add qt4/QtCore to help find Qt headers when cross-compiling. 2011-07-22 13:38:36 -06:00
Clinton Stimpson
e7f05d9759 Add imported targets support for frameworks on Mac. 2011-06-13 17:21:41 -06:00
Markus Rathgeb
46f64bd9e7 When cross compiling, don't double-root paths when using find_*. 2011-03-10 14:17:13 -07:00
Clinton Stimpson
6b9bc54566 Fix regression in 43cb9b8. 
Put back some code for setting the QT_VERSION_* variables that wasn't supposed to be removed.
 2011-02-23 17:13:49 -07:00
Brad King
62f816adde Merge topic 'qt4-fphsa' 
7a1027a When checking find_package() components, special case qtmain.
4c1c358 FindQt4: Include builtin FindPackageHandleStandardArgs directly
43cb9b8 Change to use fphsa to check required variables and version.
 2011-02-22 14:36:33 -05:00
Clinton Stimpson
4167be052f Fix issues with find_path() for QtCore include dir on Mac. Fixes 11868. 2011-02-19 15:30:02 -07:00
Clinton Stimpson
7a1027a1b6 When checking find_package() components, special case qtmain. 
Its just a library on Windows only.
Fixes bug #11791.
 2011-02-04 09:01:55 -05:00
Brad King
4c1c358332 FindQt4: Include builtin FindPackageHandleStandardArgs directly 
Apply to FindQt4 change from commit b0118402 (Use absolute path to
FindPackageHandleStandardArgs.cmake everywhere, 2010-09-28).
 2011-01-20 11:46:32 -05:00
Clinton Stimpson
858fe0ed41 Replace exec_program with execute_process for qmake queries. 2011-01-17 19:14:22 -07:00
Clinton Stimpson
43cb9b8276 Change to use fphsa to check required variables and version. 
Also, set the required variables based on components, if specified.
Also, don't make finding uic required if not using QtGui.
 2011-01-14 21:26:19 -07:00
Clinton Stimpson
e6bb8c7a6e Add support for using static/dynamic Qt plugins. 2011-01-01 11:45:05 -07:00
Clinton Stimpson
cfba5ef111 Fix regression in 2dae2f1 which added find of Qt imports dir. 2010-10-15 16:36:14 -06:00
Clinton Stimpson
2dae2f1a0b Find imports dir in Qt 4.7 2010-10-08 20:55:55 -06:00