30419 Commits

Author SHA1 Message Date
Raffi Enficiaud
e5b70ed013 CPackDEB: added config file optional Source field 2015-11-04 21:46:22 +01:00
Raffi Enficiaud
f2d98e2d3c CPackDEB: minor documentation and debug logging fixes 2015-11-04 21:45:55 +01:00
Brad King
59315f5b00 Merge topic 'cpack-deb-compression-scheme-test'
341cd934 CPackDeb: ctest tests for compression scheme leak
2015-11-04 10:14:54 -05:00
Brad King
7a37936adf Merge topic 'find-cuda-dl'
b1efb023 FindCUDA: drop CUDA_dl_LIBRARY
2015-11-04 10:13:29 -05:00
Brad King
49ac682d39 Merge topic 'vs-show-def-files'
e7e713cc VS: Add module definition `.def` files to .vcxproj files (#15313)
247c168b Refactor `.def` file lookup
adfc8a67 cmGeneratorTarget: Fix IMPLEMENT_VISIT_IMPL for template data types
2015-11-04 10:13:27 -05:00
Brad King
1e83e41d5e Merge topic 'add-armcc-toolchain'
2098e8e8 Help: Add notes for topic 'add-armcc-toolchain'
035a658f Add support for the ARM Compiler (arm.com)
2015-11-04 10:13:24 -05:00
Brad King
2098e8e8ff Help: Add notes for topic 'add-armcc-toolchain' 2015-11-04 10:04:34 -05:00
Tim Grothe
e7e713cc05 VS: Add module definition .def files to .vcxproj files (#15313)
Make them appear in the IDE project tree for reference by developers.
2015-11-04 09:15:14 -05:00
Tim Grothe
247c168b98 Refactor .def file lookup
Return a `cmSourceFile const*` from GetModuleDefinitionFile so that
callers can get more information than just the path to the file.
2015-11-04 09:15:14 -05:00
Brad King
adfc8a677e cmGeneratorTarget: Fix IMPLEMENT_VISIT_IMPL for template data types
Update spacing near the DATATYPE reference to prevent construction
of `>>` as a preprocessing token if DATATYPE is a template type.
2015-11-04 09:15:13 -05:00
Brad King
73f255e29d cmFortranLexer: Populate empty doxygen @param comments
Re-apply the change from commit v3.0.0-rc1~554^2~2 (cm*Lexer: Populate
empty doxygen @param comment, 2013-09-19) after recent lexer generation.
2015-11-04 09:13:18 -05:00
Kitware Robot
fe00c137a8 CMake Nightly Date Stamp 2015-11-04 00:01:05 -05:00
Rolf Eike Beer
b1efb0233e FindCUDA: drop CUDA_dl_LIBRARY
There is the global CMAKE_DL_LIBS setting which can be used instead. There are
even platforms where this is either empty because those functions are part of
the libc or is called entirely different, so this code wouldn't work reliable
anyway.
2015-11-03 23:04:29 +01:00
Raffi Enficiaud
341cd93489 CPackDeb: ctest tests for compression scheme leak
Test that changing compression of debian package
content does not affect DEBIAN/ files which must
be gzipped
2015-11-03 18:18:35 +01:00
Kitware Robot
b87bed0ff6 CMake Nightly Date Stamp 2015-11-03 00:01:08 -05:00
Brad King
a3c5ca960b cmGlobalNinjaGenerator: Save 'ninja' version very early
Keep it in a member variable for convenient reference.  Store the
value as soon as it is known.
2015-11-02 16:37:59 -05:00
Brad King
ed67f40522 cmGlobalNinjaGenerator: Save path to 'ninja' tool very early
Keep it in a member variable for convenient reference.  Set the
value as soon as it is known.
2015-11-02 16:27:31 -05:00
Brad King
ba819f49df cmFortranParser: Parse #line directives
Teach the lexer to extract the #line directive prefix and line number as
a new token type.  Teach the parser to recognize this token followed by
a string as the file name (plus possibly other content).  Report the
named file as included by the source file.
2015-11-02 15:29:52 -05:00
Brad King
7748a02c3f Merge branch 'release' 2015-11-02 14:26:04 -05:00
Joakim Andersson
035a658f4f Add support for the ARM Compiler (arm.com)
Create an `ARMCC` compiler id corresponding to compilers identified and
versioned by the `__ARMCC_VERSION` predefined macro.  See documentation
for the compilers at

 http://infocenter.arm.com/help/topic/com.arm.doc.set.swdev/index.html
2015-11-02 13:45:24 -05:00
Brad King
bc4b6aa68d CMake 3.4.0-rc3 2015-11-02 09:12:44 -05:00
Brad King
74ea66850c Merge branch 'release' 2015-11-02 09:11:13 -05:00
Brad King
2aaf702dec Merge topic 'macosx_rpath-clarify-doc'
f8eb72fe Help: Clarify documentation for MACOSX_RPATH variable.
2015-11-02 09:09:55 -05:00
Brad King
9d1c77cfda Merge topic 'doc-apple-info-plist-properties'
9a7f042a Help: Document target properties setting Info.plist fields (#15820)
2015-11-02 09:09:52 -05:00
Brad King
06ed3eb9e9 Merge topic 'xcode-lastupgradecheck'
13610474 Xcode: Set LastUpgradeCheck to current Xcode version (#15817)
2015-11-02 09:09:49 -05:00
Brad King
b7b3b675fd Merge topic 'fix-find_program-regression'
31e6571c find_program: Fix regression in finding an already-known path
2015-11-02 09:09:46 -05:00
Clinton Stimpson
f8eb72fe5f Help: Clarify documentation for MACOSX_RPATH variable. 2015-11-02 06:46:02 -07:00
Kitware Robot
96ac964d76 CMake Nightly Date Stamp 2015-11-02 00:01:11 -05:00
Kitware Robot
3db46ec57d CMake Nightly Date Stamp 2015-11-01 00:01:05 -04:00
Kitware Robot
b7fdc8cc39 CMake Nightly Date Stamp 2015-10-31 00:01:07 -04:00
Gregor Jasny
1361047406 Xcode: Set LastUpgradeCheck to current Xcode version (#15817)
This prevents the project settings upgrade warning.
2015-10-30 22:28:04 +01:00
Brad King
1dcaadc515 Merge branch 'doc-apple-info-plist-properties' into release 2015-10-30 09:14:57 -04:00
Brad King
9a7f042a95 Help: Document target properties setting Info.plist fields (#15820)
Format the documentation of MACOSX_{BUNDLE,FRAMEWORK}_INFO_PLIST and
specify for each property what field in the Info.plist file it sets.
2015-10-30 09:09:40 -04:00
Brad King
1178b53662 Merge branch 'fix-find_program-regression' into release 2015-10-30 08:38:13 -04:00
Brad King
31e6571cca find_program: Fix regression in finding an already-known path
Changes in commit v3.4.0-rc1~124^2~1 (cmFindProgramCommand: Re-implement
search using more flexible approach, 2015-09-01) did not preserve the
behavior of looking for the given name with no search path at all.
Fix this and add a test case covering finding an absolute path with
no search directories.
2015-10-30 07:40:46 -04:00
Kitware Robot
a375702eaa CMake Nightly Date Stamp 2015-10-30 00:01:07 -04:00
Brad King
4f9a02db41 Merge branch 'release' 2015-10-29 13:40:39 -04:00
Brad King
1f9affacda Merge topic 'intel-fortran-2016'
77be366c Intel: Recognize MSVC version for Intel Fortran 2016 (#15809)
2015-10-29 13:40:04 -04:00
Brad King
b5c75a8e88 Merge topic 'README-fix-typo'
6c0d8a5d README: Fix typo in wording
2015-10-29 09:29:05 -04:00
Terrell Russell
6c0d8a5d02 README: Fix typo in wording 2015-10-29 09:25:52 -04:00
Brad King
3ca925579c Merge branch 'release' 2015-10-29 09:06:26 -04:00
Brad King
1227ea38e5 Merge branch 'intel-fortran-2016' into release 2015-10-29 09:04:05 -04:00
Brad King
81dbab6e08 Merge branch 'backport-revert-autorcc-qt-5.1' into release 2015-10-29 09:03:44 -04:00
Brad King
e41c1be543 Merge branch 'vs-resw-files' into release 2015-10-29 09:03:30 -04:00
Brad King
41e5605d02 Merge topic 'vs-resw-files'
77dde5cb VS: Add support for `.resw` files (#15811)
2015-10-29 08:42:32 -04:00
Brad King
5cdba31fc6 Merge topic 'cpack-osx-sysroot'
63e2af0f CPack: Fix CPACK_OSX_SYSROOT with symbolic CMAKE_OSX_SYSROOT (#15816)
2015-10-29 08:42:30 -04:00
Brad King
7f6c613fd0 Merge topic 'bootstrap-cleanup'
3b0c0743 bootstrap: Drop unused KWSys header directories
2015-10-29 08:42:27 -04:00
Brad King
3179d9a241 Merge topic 'FindPkgConfig-better-error'
1bfb527f FindPkgConfig: return actual error when a package is not found (#15810)
2015-10-29 08:42:25 -04:00
Brad King
b5d94065c0 Merge topic 'autorcc-qt-5.1-compat'
e78fcc63 QtAutogen: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)
2015-10-29 08:42:22 -04:00
Brad King
e14709e5a5 Merge topic 'revert-autorcc-qt-5.1'
5ba32092 Merge branch 'backport-revert-autorcc-qt-5.1' into revert-autorcc-qt-5.1
10e8ccf6 Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
b935db3a Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
2015-10-29 08:42:19 -04:00