Kitware Robot
521b930bf4
CMake Nightly Date Stamp
2014-03-31 00:01:05 -04:00
Kitware Robot
9298987a82
CMake Nightly Date Stamp
2014-03-30 00:01:06 -04:00
Kitware Robot
5bad8ae342
CMake Nightly Date Stamp
2014-03-29 00:01:05 -04:00
Kitware Robot
cab2e31443
CMake Nightly Date Stamp
2014-03-28 00:01:05 -04:00
Brad King
ede0419a37
Merge topic 'osx-CFBundle-info-plist'
...
90e22f8f
OS X: Fix Info.plist placement in a CFBundle
2014-03-27 11:12:10 -04:00
Brad King
e8451d6426
Merge topic 'threads-cleanup'
...
693f8bf3
FindThreads: simplify checking for SunOS
858ce31f
FindThreads: avoid useless checks if a thread library is already found
fdf7bd27
FindThreads: replace MATCHES with STREQUAL
2014-03-27 11:12:08 -04:00
Brad King
0301e36fcd
Merge topic 'suppress-diagnostic-context-note-warnings'
...
53674755
CTestCustom: Suppress "note: in expansion of macro" diagnostic context
2014-03-27 11:12:07 -04:00
Brad King
c53e82093f
Merge topic 'fix-CTestTestMemcheck-xcode2-missing-dirs'
...
27b81213
Tests/CTestTestMemcheck: Help Xcode 2.x create output dirs
2014-03-27 11:12:05 -04:00
Kitware Robot
e03ac807cf
CMake Nightly Date Stamp
2014-03-27 00:01:18 -04:00
Brad King
27b812132c
Tests/CTestTestMemcheck: Help Xcode 2.x create output dirs
...
Add the PRE_BUILD step to all targets that need it so the output
directories get created no matter which target is built first.
2014-03-26 15:09:56 -04:00
Brad King
536747552f
CTestCustom: Suppress "note: in expansion of macro" diagnostic context
...
Such notes only appear with other diagnostics and should not be
considered a warning on their own.
2014-03-26 14:00:16 -04:00
Brad King
63c6325487
Merge topic 'fix-Qt-manual-typo'
...
dcfbbe87
Help: Fix typo in cmake-qt manual.
2014-03-26 13:24:47 -04:00
Brad King
6ae3fbfeda
Merge topic 'dev/find-boost-graph_parallel'
...
f284b003
FindBoost: Search next to MPI libs for graph_parallel (#14832 )
2014-03-26 13:24:45 -04:00
Brad King
edb506b862
Merge topic 'fix-Qt-Autogen'
...
71a11252
QtAutogen: Fix use of multiple ui files in a single target.
261acd91
QtAutogen: Use the basename for resource files.
2014-03-26 13:24:43 -04:00
Brad King
098a39f21c
Merge topic 'simplify-empty-LDFLAGS'
...
1b18f442
Avoid trailing space in CMAKE_*_LINKER_FLAGS when LDFLAGS is empty
2014-03-26 13:24:42 -04:00
Brad King
2cb8417584
Merge topic 'FindPkgConfig-stop-on-missing'
...
63a4c0af
FindPkgConfig: Stop processing when REQUIRED package not found (#14381 )
2014-03-26 13:24:40 -04:00
Brad King
a11d1c6135
Merge topic 'dev/custom-ninja-deptypes'
...
9523d2a5
ninja: Add support for custom depfile formats
2014-03-26 13:24:39 -04:00
Brad King
f04e217cc1
Merge topic 'remove-CMakeFiles-advice'
...
bccc056b
cmake: Advise user to remove CMakeFiles with CMakeCache.txt (#14820 )
2014-03-26 13:24:37 -04:00
Brad King
06c9f55449
Merge topic 'haiku-updates'
...
0cc42b87
Haiku: Fix compiler detection when using distcc
84603d80
Haiku: Enable CMake builtin ELF editor
2014-03-26 13:24:36 -04:00
Brad King
ab07d383a9
Merge topic 'fix-Qt4-moc-commands-depends'
...
734df96f
Qt4: Fix moc command dependencies for incremental build.
2014-03-26 13:24:34 -04:00
Brad King
9b536b914b
Merge topic 'report-INTERFACE-type-in-conflict'
...
f1fd3714
cmMakefile: Report type of INTERFACE library in conflict.
2014-03-26 13:24:33 -04:00
Brad King
bcd4d0ced8
Merge topic 'UseJava-fix-resource-copy'
...
2abd8efe
UseJava: Copy resource files before compiling the jar (#13360 )
2014-03-26 13:24:31 -04:00
Brad King
5ae8f33617
Merge topic 'update-kwsys'
...
ed6ddb89
Merge branch 'upstream-kwsys' into update-kwsys
12faf00d
KWSys 2014-03-19 (a8aa1014)
2014-03-26 13:24:30 -04:00
Brad King
046c1a1f65
Merge topic 'compile-m-as-c'
...
95cdf132
Treat .m files consistently as C across all generators
2014-03-26 13:24:28 -04:00
Brad King
74a45ce647
Merge topic 'UseSWIG-revert-bad-fix-0010080'
...
d9760647
Revert "UseSWIG: Name extra generated files after module name (#10080 )"
2014-03-26 13:24:26 -04:00
Brad King
7e92f047be
Merge branch 'release'
2014-03-26 13:07:26 -04:00
Stephen Kelly
dcfbbe87eb
Help: Fix typo in cmake-qt manual.
...
Do -> To.
2014-03-26 17:50:08 +01:00
Tim Blechmann
90e22f8f71
OS X: Fix Info.plist placement in a CFBundle
...
Fix cmOSXBundleGenerator::CreateCFBundle to place Info.plist under the
same root directory as the rest of the bundle. Without this, Info.plist
was placed into CMAKE_BINARY_DIR, not CMAKE_CURRENT_BINARY_DIR because
the target path was not generated correctly.
2014-03-26 10:52:23 -04:00
Kitware Robot
a29ea834de
CMake Nightly Date Stamp
2014-03-26 00:01:05 -04:00
Rolf Eike Beer
693f8bf34d
FindThreads: simplify checking for SunOS
2014-03-25 23:49:54 +01:00
Rolf Eike Beer
858ce31f4c
FindThreads: avoid useless checks if a thread library is already found
2014-03-25 23:47:49 +01:00
Rolf Eike Beer
fdf7bd27a3
FindThreads: replace MATCHES with STREQUAL
2014-03-25 22:46:11 +01:00
Ben Boeckel
f284b003d7
FindBoost: Search next to MPI libs for graph_parallel ( #14832 )
...
In addition to the MPI libraries, graph_parallel lives in the MPI libdir
as well.
2014-03-25 16:26:11 -04:00
Kitware Robot
a56a8f9536
CMake Nightly Date Stamp
2014-03-25 00:01:06 -04:00
Stephen Kelly
71a11252e9
QtAutogen: Fix use of multiple ui files in a single target.
...
Don't store a mapping of the directory to the ui file. The directory
will be a unique key, allowing only one ui file to be specified.
Use the source file name instead as the mapping key.
2014-03-25 01:39:03 +01:00
Stephen Kelly
261acd9109
QtAutogen: Use the basename for resource files.
...
The rcc tool generates a cpp file with a symbol called qInitResources
or called qInitResources_${name}, if the name is passed. The
qInitResources symbol clashes if multiple qrc files are used in
one target.
Always pass the name to ensure that the symbol is unique. This is also
the behavior of the qtx_add_resource macros.
2014-03-25 01:16:49 +01:00
Jiri Malak
1b18f442f4
Avoid trailing space in CMAKE_*_LINKER_FLAGS when LDFLAGS is empty
2014-03-24 09:11:48 -04:00
Christoph Grüninger
63a4c0af31
FindPkgConfig: Stop processing when REQUIRED package not found ( #14381 )
...
Make the behavior similar to find_package.
2014-03-24 08:57:31 -04:00
Kitware Robot
8a306d68e0
CMake Nightly Date Stamp
2014-03-24 00:01:06 -04:00
Ben Boeckel
9523d2a55c
ninja: Add support for custom depfile formats
...
Not everything that isn't MSVC is GCC. I have support for LDC's depfile
format on its way upstream[1], but its future is uncertain. CMake should
at least support this for future depfile formats.
[1]https://github.com/martine/ninja/pull/721
2014-03-23 23:54:13 -04:00
Kitware Robot
6f39a6ff32
CMake Nightly Date Stamp
2014-03-23 00:01:06 -04:00
Kitware Robot
d514e41118
CMake Nightly Date Stamp
2014-03-22 00:01:05 -04:00
Brad King
bccc056ba8
cmake: Advise user to remove CMakeFiles with CMakeCache.txt ( #14820 )
2014-03-21 08:28:37 -04:00
Adrien Destugues
0cc42b871a
Haiku: Fix compiler detection when using distcc
...
Also remove outdated include directories.
2014-03-21 08:19:10 -04:00
Adrien Destugues
84603d804c
Haiku: Enable CMake builtin ELF editor
...
Co-Author: Brad King <brad.king@kitware.com>
2014-03-21 08:19:09 -04:00
Stephen Kelly
734df96f5a
Qt4: Fix moc command dependencies for incremental build.
...
Since commit v2.8.12~327^2 (Qt4Macros: Allow specifying a TARGET
in invokations of macros., 2013-02-26), a parameters file is
populated with moc arguments at generate-time.
When the compile definitions or include directories change, the
parameters file is updated but moc is not re-run in response.
Fix that by making the moc invocation depend on the parameters file.
Reported-At: https://bugreports.qt-project.org/browse/QTBUG-36970
2014-03-21 11:14:41 +01:00
Kitware Robot
6373e08d43
CMake Nightly Date Stamp
2014-03-21 00:01:16 -04:00
Stephen Kelly
f1fd3714a4
cmMakefile: Report type of INTERFACE library in conflict.
2014-03-20 22:09:32 +01:00
Bruno Nova
2abd8efecb
UseJava: Copy resource files before compiling the jar ( #13360 )
...
Co-Author: Mary Ellen Foster <mefoster@gmail.com>
2014-03-20 09:50:47 -04:00
Brad King
ed6ddb89bf
Merge branch 'upstream-kwsys' into update-kwsys
2014-03-20 09:42:27 -04:00