kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
23,755 Commits 1 Branch 14 Tags
Commit Graph

23755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kitware Robot
a29ea834de CMake Nightly Date Stamp 2014-03-26 00:01:05 -04: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
KWSys Robot
12faf00d71 KWSys 2014-03-19 (a8aa1014) 
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ a8aa1014 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' dd873734..a8aa1014
Gerhard Grimm (1):
      fa86f1ba SystemInformation: Fix HP-UX PA-RISC processor detection

Rolf Eike Beer (1):
      a8aa1014 SystemInformation: Fix HP-UX Intel processor detection

Change-Id: I5891a6898cc73caf1b2be98859d5d4b11a24c5df
 2014-03-20 09:42:18 -04:00
Tim Blechmann
95cdf13248 Treat .m files consistently as C across all generators 
Objective C sources should be compiled with the C compiler, not C++.

The Xcode generator correctly classifies ".m" sources already.  The
cmSystemTools::GetFileFormat method was fixed by commit v2.8.0~1782 (fix
for 7045, use gcc for .m, 2008-08-19) but it is not used by any of the
generator since commit v2.4.0~2819 (major changes to support addition of
languages, 2004-09-22).

Fix the CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS table entries so that
cmGlobalGenerator::GetLanguageFromExtension tells the Makefile, Ninja,
and VS IDE generators to compile ".m" sources as C.  This makes behavior
consistent on all generators.

Signed-off-by: Tim Blechmann <tim@klingt.org>
 2014-03-20 09:40:41 -04:00
Brad King
a48de7d850 CMake 3.0.0-rc3 2014-03-20 09:26:39 -04:00
Brad King
0f79dab48b Merge branch 'release' 2014-03-20 09:24:44 -04:00
Brad King
d8fb08a391 Merge topic 'watcom-updates' 
64c2342a Watcom: Enable 'WMake Makefiles' generator on Linux
5d9aa66c Watcom: Introduce OpenWatcom compiler id and fix compiler version
9292d3b8 Watcom: Detect compiler target architecture and platform
fbc883c9 Watcom: Add one blank line to Makefile for better readability
 2014-03-20 09:22:30 -04:00
Brad King
565213c1fd Merge topic 'configure_file-unicode' 
98383f80 Unicode: check encoding of files given to configure_file.
 2014-03-20 09:22:28 -04:00
Brad King
df136e6c27 Merge topic 'ExternalProject-no-download-progress' 
f1b953ec Help: Add notes for topic 'ExternalProject-no-download-progress'
7d35b550 ExternalProject: Add option to disable download progress (#14807)
 2014-03-20 09:22:26 -04:00
Brad King
b048a3edd0 Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH_2' 
cc5a0d8f FindPkgConfig: More unit tests
453d2b24 FindPkgConfig: small refactoring
 2014-03-20 09:22:25 -04:00
Brad King
82c590b12e Merge topic 'CheckTypeSize_#14056' 
7f857775 CheckTypeSize: Add unit test to cover the no-C case
7d6d45f2 CheckTypeSize: Support for CXX when C language is not enabled
 2014-03-20 09:22:23 -04:00
Brad King
c79d98b457 Merge topic 'file-DOWNLOAD-cap-progress' 
413282c0 file: Avoid runaway DOWNLOAD/UPLOAD progress reports (#14807)
 2014-03-20 09:22:21 -04:00
Brad King
9c609db988 Merge topic 'minor_cleanups' 
19012b46 cmMakefile: Fix style.
10e6f1e7 cmMakefile: Fix typo in comment.
c3a2f78b Makefiles: Remove duplicate code.
2e0611f9 cmGeneratorExpression: Remove unused include.
d83ef53a Rename local 'dir_max' variables to 'dir'
 2014-03-20 09:22:20 -04:00
Brad King
aa8f8777a4 Merge topic 'fix-AllFindModules-test-module-path' 
cf3e87e1 Tests: Teach CMakeOnly.AllFindModules to tolerate a system KDE4
 2014-03-20 09:22:18 -04:00
Brad King
e1c1f18e39 Merge topic 'add_custom_command-DEPENDS-genex' 
bbffccca add_custom_command: Evaluate generator expressions in DEPENDS
 2014-03-20 09:22:17 -04:00
Brad King
deb981c052 Merge topic 'Android-platform' 
77f06b14 Modules: Add an Andriod platform file
 2014-03-20 09:22:15 -04:00
Brad King
fb60cf46b6 Merge topic 'fix-out-of-date-CTestTestMemcheck' 
84a42304 Tests: Prevent unnecessary rebuilds in CTestTestMemcheck
 2014-03-20 09:22:14 -04:00