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

18416 Commits

Author SHA1 Message Date
Brad King
b9c1eb4dcc Merge topic 'makefile-depscan-BOM' 
af924827 Makefile: Tolerate a BOM while scanning source dependencies (#15493)
 2015-04-06 08:58:17 -04:00
Brad King
9ddbacdb74 Merge topic 'test_cpack_symlinks' 
5f686b8a Tests: Add case for CPack source package with symlinks
aca1d93b cpack: Disable CMake Cygwin legacy warning while packaging
 2015-04-06 08:58:14 -04:00
Stephen Kelly
c22f6c1504 Remove unused includes. 2015-04-06 14:41:05 +02:00
Kitware Robot
03f7a509ef CMake Nightly Date Stamp 2015-04-06 00:01:04 -04:00
Domen Vrankar
0ffd35340e CPack single component packaging 
RPM, DEB and archive packages were not created
in cases when CPACK_<generator>_COMPONENT_INSTALL
was set to ON and a single component existed.
Patch also changes CPackRPM test to implicitly
test for this case.
 2015-04-05 22:49:41 +02:00
Stephen Kelly
c37cf7fa9e cmCacheManager: Remove unused method 2015-04-05 10:26:10 +02:00
Stephen Kelly
64556e3dfa cmCacheManager: Remove unused overloads. 2015-04-05 10:26:10 +02:00
Stephen Kelly
23bb5d225b cmCacheManager: Remove use of intermediate overload. 2015-04-05 10:26:10 +02:00
Stephen Kelly
510562e3e7 cmGlobalGenerator: Don't fetch the cache manager in a loop. 
It doesn't change from Makefile to Makefile.
 2015-04-05 10:26:10 +02:00
Stephen Kelly
629e948936 cmake: Clear member rather than explicit erase. 2015-04-05 10:26:10 +02:00
Stephen Kelly
d280bae98f cmake: Be clear that there is no chaining after global properties. 2015-04-05 10:26:09 +02:00
Stephen Kelly
364c7ea187 cmake: Remove unused method. 2015-04-05 10:26:09 +02:00
Stephen Kelly
47acfe1d1e cmake: Remove unused member. 2015-04-05 10:10:00 +02:00
Kitware Robot
a3e2de3a31 CMake Nightly Date Stamp 2015-04-05 00:01:04 -04:00
Gregor Jasny
dfd6f1f290 Xcode: Also quote strings containing // (#15487) 
Otherwise those will be interpreted as start of a comment

Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
 2015-04-04 22:13:45 +02:00
Stephen Kelly
a469bf7b98 cmMakefile: Remove one wrong and one insufficiently helpful comment. 2015-04-04 18:31:03 +02:00
Stephen Kelly
257c16495a cmListFile: Remove unused member. 
It is written, but not read since commit v2.4.0~575 (ENH: Since list file
cache does not make much sense any more ..., 2006-02-07).
 2015-04-04 18:31:03 +02:00
Stephen Kelly
fe17092c20 cmMakefile: Remove bogus comment. 2015-04-04 18:31:03 +02:00
Stephen Kelly
199b28ac3a Remove duplicate tag name. 2015-04-04 18:30:52 +02:00
Kitware Robot
c6624cfdc1 CMake Nightly Date Stamp 2015-04-04 00:01:05 -04:00
Gilles Khouzam
01a9ab0def VS: Add support for XAML source files 
XAML files are by default of type Page in the vcxproj and can be
overriden by setting the VS_XAML_TYPE property.  The .cpp and .h file
of the same name are automatically added as depending on the XAML file.

New VSXaml test builds a basic XAML WindowsStore 8.1 app with VS2013.
 2015-04-03 13:40:35 -04:00
Brad King
af92482712 Makefile: Tolerate a BOM while scanning source dependencies (#15493) 
Otherwise an #include directive on the first line of a source file is
ignored if the file contains a Byte-Order-Mark.

Suggested-by: Aleksey Konovalov <konovalov.aleks@gmail.com>
 2015-04-03 13:04:57 -04:00
Kitware Robot
2978a5549a CMake Nightly Date Stamp 2015-04-03 00:01:04 -04:00
Brad King
0983825057 Merge topic 'remove-DEFINITIONS-directory-property' 
06f61c26 Do not treat DEFINITIONS as a built-in directory property
 2015-04-02 13:06:03 -04:00
Stephen Kelly
06f61c26cf Do not treat DEFINITIONS as a built-in directory property 
Add policy CMP0059 to cover this change.  The property has been
deprecated since CMake 2.4 anyway.

This will help clean up cmMakefile -- the DefineFlagsOrig member should
not need to exist.
 2015-04-02 13:00:48 -04:00
Brad King
9780859b7e Merge topic 'clean-up-cmMakefile' 
f2e07a6d cmMakefile: Remove unused PreOrder member.
aafe2821 cmMakefile: Remove unused Prefix member.
1fcf590b cmMakefile: Remove unused SubDirectoryOrder member.
c3a60cc9 cmMakefile: Remove AddExtraDirectory method.
37897347 cmMakefile: Remove unused method.
d7539ced cmMakefile: Remove bogus comment.
 2015-04-02 12:57:41 -04:00
Brad King
1a775917a5 Merge topic 'xcode-source-type-metal' 
078c7321 Xcode: Add file type for Metal shader files
 2015-04-02 12:57:18 -04:00
Kitware Robot
f707460e42 CMake Nightly Date Stamp 2015-04-02 00:01:04 -04:00
Sean James
078c732185 Xcode: Add file type for Metal shader files 2015-04-01 15:15:22 -04:00
Stephen Kelly
f2e07a6d90 cmMakefile: Remove unused PreOrder member. 
Remove references from dependendent API.
 2015-04-01 20:32:48 +02:00
Stephen Kelly
aafe282188 cmMakefile: Remove unused Prefix member. 
Unused since it was added in commit 1f42f521 (NEW: move from tools
and config to create CMake, 2000-08-29).
 2015-04-01 20:32:48 +02:00
Stephen Kelly
1fcf590b14 cmMakefile: Remove unused SubDirectoryOrder member. 
The last use was removed in v2.4.0~2054 (ENH: add support for out
of source source, 2005-03-14)
 2015-04-01 20:32:47 +02:00
Stephen Kelly
c3a60cc9cc cmMakefile: Remove AddExtraDirectory method. 
It has no effect.
 2015-04-01 20:32:47 +02:00
Stephen Kelly
37897347b3 cmMakefile: Remove unused method. 
The last user was removed in commit v2.4.0~1516 (ENH: removed unused
files, 2005-06-20).
 2015-04-01 20:32:47 +02:00
Stephen Kelly
d7539ced64 cmMakefile: Remove bogus comment. 2015-04-01 20:32:47 +02:00
Brad King
0de7807c36 Merge topic 'cpack-deb-format-cast' 
e86f44b7 cmCPackDebGenerator: Cast file mode to proper type for %o formatter
 2015-04-01 13:19:41 -04:00
Brad King
4a821a47f7 Merge topic 'cpack-fix-preinstall-tool' 
93a3ec8b CPack: Fix make tool selection during preinstall (#15483)
 2015-04-01 13:19:37 -04:00
Brad King
aa508a5299 Merge topic 'makefile-DELETE_ON_ERROR' 
44990732 Help: Add notes for topic 'makefile-DELETE_ON_ERROR'
4adf1dad Makefile: Tell GNU make to delete rule outputs on error (#15474)
 2015-04-01 13:19:32 -04:00
Brad King
aca1d93bd9 cpack: Disable CMake Cygwin legacy warning while packaging 
In cpack we load the platform information modules to give the
configuration scripts access to the host system information.
CYGWIN.cmake warns unless we explicitly tell it not to warn
since there is no chance for a cmake_minimum_required(VERSION)
to be called.
 2015-04-01 12:57:43 -04:00
Kitware Robot
c0312d9276 CMake Nightly Date Stamp 2015-04-01 00:01:04 -04:00
Brad King
e86f44b726 cmCPackDebGenerator: Cast file mode to proper type for %o formatter 2015-03-31 16:28:28 -04:00
Brad King
93a3ec8b77 CPack: Fix make tool selection during preinstall (#15483) 
The CMAKE_MAKE_PROGRAM selected by CMake while configuring the project
should also be used to drive the "preinstall" target during packaging.
Teach CPack to use "cmake --build" instead of constructing the build
command line itself.  The "cmake --build" command already knows how
to select the proper make tool.
 2015-03-31 10:30:25 -04:00
Kitware Robot
a6b0b835ac CMake Nightly Date Stamp 2015-03-31 00:01:04 -04:00
Brad King
4adf1dad2a Makefile: Tell GNU make to delete rule outputs on error (#15474) 
Add .DELETE_ON_ERROR to the "build.make" files that contain the actual
build rules that generate files.  This tells GNU make to delete the
output of a rule if the recipe modifies the output but returns failure.
This is particularly useful for custom commands that use shell
redirection to produce a file.

Do not add .DELETE_ON_ERROR for Borland or Watcom make tools because
they may not tolerate it and would not honor it anyway.  Other make
tools that do not understand .DELETE_ON_ERROR will not be hurt.

Suggested-by: Andrey Vihrov <andrey.vihrov@gmail.com>
 2015-03-30 16:35:48 -04:00
Brad King
c1f8c6cdf9 Merge topic 'cpack-archive-prefix' 
e3f84fc5 cpack: Fix CPACK_PACKAGING_INSTALL_PREFIX handling for archives (#14677)
 2015-03-30 09:27:55 -04:00
Brad King
c117c2bb5e Merge topic 'add_dependencies-INTERFACE-libraries' 
ac14cbf0 Allow add_dependencies() on INTERFACE libraries (#15414)
817d31db Help: Format add_dependencies documentation
 2015-03-30 09:27:53 -04:00
Brad King
a3bdb5578d Merge topic 'ninja-autogen' 
4d08e6b6 QtAutogen: Fix rcc rebuild with Ninja generator (#15459)
 2015-03-30 09:27:51 -04:00
Brad King
ac6297ea38 Merge topic 'xcode-default-ARCHS' 
b76b52c0 Xcode: Set ARCHS only when CMAKE_OSX_ARCHITECTURES is specified (#14736)
9e14a5de cmGlobalXCodeGenerator: Simplify ARCHS list with cmJoin
 2015-03-30 09:27:47 -04:00
Brad King
136a534f72 Merge topic 'wix-fix-utf8' 
98a3b2e2 CPackWIX: Omit codepage conversion when internal encoding is already UTF-8.
 2015-03-30 09:27:45 -04:00
Brad King
aa15ef8a84 Merge topic 'clean-scanbuild-warnings' 
e680d43d Fix an unused variable warning from scanbuild.
a4a1b729 Fix warnings from clang scanbuild.
 2015-03-30 09:27:42 -04:00