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

16151 Commits

Author SHA1 Message Date
Brad King
382c9ee859 Merge topic 'link-line-quoting' 
423009c1 Makefile: Generate single-quoted object lists for Watcom
a863a8fe cmLocalUnixMakefileGenerator3: Re-organize ConvertToQuotedOutputPath
 2014-04-01 11:06:08 -04:00
Jiri Malak
2b89675256 Ninja: Simplify code for linker commands 
Use GetCreateRuleVariable function instead of redundant code for Rule
variable name.  Use temporary variables to improve code.
 2014-04-01 10:58:58 -04:00
Kitware Robot
e3e1ba3f78 CMake Nightly Date Stamp 2014-04-01 00:01:05 -04:00
Stephen Kelly
857d30b52e cmGlobalGenerator: Add interface to call ForceLinkerLanguages 
Avoid calling it too early when cmGeneratorTarget instances don't
yet exist.
 2014-03-31 23:18:44 +02:00
Stephen Kelly
28e1d2f8fc cmStringCommand: Add GENEX_STRIP subcommand. 
Strip out any generator expressions in the input string.
 2014-03-31 23:18:44 +02:00
Stephen Kelly
bf98cc252f Genex: Evaluate TARGET_OBJECTS as a normal expression. 2014-03-31 23:18:44 +02:00
Stephen Kelly
8cd113ad1d cmTarget: Store strings instead of cmSourceFile* to represent SOURCES. 
This will allow the strings to contain generator expressions.

At this point, generator expressions are still not part of the
SOURCES property when it is read.
 2014-03-31 23:18:44 +02:00
Stephen Kelly
4959f3413c cmSourceFileLocation: Collapse full path for directory comparisons. 
Otherwise Matches() ends up doing a comparison of
the directories

 /path/to/dir/subdir/..

and

 /path/to/dir

as strings and not matching where it should.
 2014-03-31 23:18:43 +02:00
Stephen Kelly
fcc9287897 cmSourceFileLocation: Remove unused Update method. 
The string overload is never called. This allows the removal of
the unused UpdateDirectory method.
 2014-03-31 23:18:43 +02:00
Stephen Kelly
59e8740aca cmTarget: Remove AddSourceFile method 
It is no longer used.
 2014-03-31 23:18:43 +02:00
Stephen Kelly
26d494ba01 cmTarget: Use string API to add sources to cmTarget objects. 
Continue to call GetOrCreateSource where necessary to create
cmSourceFile objects which have the GENERATED attribute set.
 2014-03-31 23:18:43 +02:00
Stephen Kelly
d38423ecc4 cmTarget: Add a method to obtain list of filenames for sources. 2014-03-31 23:18:43 +02:00
Stephen Kelly
b1cbba68ce cmSourceFileLocation: Make copyable and assignable. 
This allows using it in containers and algorithms.
 2014-03-31 23:18:43 +02:00
Stephen Kelly
0ed5ce4cd8 cmTarget: Rename AddSource method for backward compatibility. 
Add a new AddSource method for future use.
 2014-03-31 23:18:43 +02:00
Stephen Kelly
99a9c51f1a cmTarget: Use GetSourceFiles for languages. 2014-03-31 23:18:43 +02:00
Stephen Kelly
beaa7e0377 cmGeneratorTarget: Compute the object directory early. 
Ensure it is populated before tracing dependencies.
 2014-03-31 23:18:43 +02:00
Nils Gladitz
77b581c2f0 Policies: omit warnings about unset policies when they are actually set to NEW 2014-03-31 09:45:10 -04:00
Sean McBride
8c9c4fe1a6 Remove 'return' statements that can never be reached 
Clang -Wunreachable-code-return warns otherwise.
 2014-03-31 09:41:05 -04:00
Kitware Robot
521b930bf4 CMake Nightly Date Stamp 2014-03-31 00:01:05 -04:00
Clinton Stimpson
480be00bfa cmake-gui: Don't resolve symlinks with using file dialog. 
This fixes bug #14274 where a clang++ symlink was resolved to
a clang executable.
 2014-03-29 22:41:44 -06: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
Jiri Malak
423009c17f Makefile: Generate single-quoted object lists for Watcom 
Drop the CMAKE_NO_QUOTED_OBJECTS internal variable from the Makefile
generators.  The underlying problem is with the Watcom linker, not with
WMake.  The Watcom linker wants object files to be single-quoted.  Add
<LINK-RULE>_USE_WATCOM_QUOTE platform information variables to tell the
generators to use Watcom-style single quotes for object files on link
lines.

On Windows, Watcom uses the GetCommandLine API to get the original
command-line string and do custom parsing that expects single quotes.
On POSIX systems, Watcom approximates the original command line by
joining all argv[] entries separated by a single space.  Therefore we
need to double-quote the single-quoted arguments so that the shell does
not consume them and they are available for the parser to see.
 2014-03-27 13:45:29 -04:00
Jiri Malak
a863a8fecd cmLocalUnixMakefileGenerator3: Re-organize ConvertToQuotedOutputPath 
Use one code path whether the components list is empty or not.
Fix indentation accordingly.
 2014-03-27 13:45:27 -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
Kitware Robot
e03ac807cf CMake Nightly Date Stamp 2014-03-27 00:01:18 -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
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
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
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
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
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
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
84603d804c Haiku: Enable CMake builtin ELF editor 
Co-Author: Brad King <brad.king@kitware.com>
 2014-03-21 08:19:09 -04: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
Brad King
ed6ddb89bf Merge branch 'upstream-kwsys' into update-kwsys 2014-03-20 09:42:27 -04:00
Brad King
a48de7d850 CMake 3.0.0-rc3 2014-03-20 09:26:39 -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