Brad King
68bb74d9e6
Merge branch 'release'
2016-06-22 13:18:48 -04:00
Brad King
d152ae123d
CMake 3.6.0-rc3
2016-06-22 09:02:00 -04:00
Brad King
4561816b64
Merge branch 'release'
2016-06-22 08:54:24 -04:00
Brad King
54e293db06
Merge topic 'FindZLIB-fixup'
...
4bb83514
FindZLIB: Do not mark unused variable as advanced
2016-06-22 08:53:04 -04:00
Brad King
ed59f4ba67
Merge topic 'GetPrerequisites-findstr'
...
867b73e2
GetPrerequisites: Optimize on Windows by filtering `objdump` output
2016-06-22 08:53:02 -04:00
Brad King
110270fbb6
Merge topic 'doc-VS_STARTUP_PROJECT-clarify'
...
d3e538ea
Help: Clarify VS_STARTUP_PROJECT documentation
2016-06-22 08:53:00 -04:00
Kitware Robot
de943c3128
CMake Nightly Date Stamp
2016-06-22 00:01:10 -04:00
Brad King
f65b2753d3
Merge branch 'release'
2016-06-21 14:01:12 -04:00
Brad King
8380f47cc9
Merge topic 'output-converter'
...
8ddbd4c2
cmOutputConverter: remove unnecessary conversion
bdaadbdc
cmOutputConverter: collapse ConvertToOutputForExisting functions
191fc3a0
cmOutputConverter: remove unused 'local' argument
b86007e3
cmOutputConverter: remove 'optional' argument
cde127b0
cmOutputConverter::Convert: invert condition
c23f89bc
cmOutputConverter::Convert: make precondition explicit
2016-06-21 13:57:16 -04:00
Brad King
cc9f6f3b98
Merge topic '14068-ctest-target-set-buildname-with-only-c-compiler'
...
6509ad29
CTest: Properly set buildname if only C langage is enabled
2016-06-21 13:57:14 -04:00
Brad King
e260f30d23
Merge topic 'FindGLEW-debug'
...
6087b9e4
FindGLEW: Search for debug and release configurations separately
2016-06-21 13:57:11 -04:00
Brad King
91392a66e1
Merge topic 'FindLua-match-header-and-lib'
...
eecd307e
FindLua: Iterate through all include subdirs to find a suitable header
3532cbce
FindLua: Check header file against suitable versions
281c707b
FindLua: Factor out a helper function for version extraction
92c67b9f
FindLua: Prefix private APIs with `_lua_`
2016-06-21 13:57:09 -04:00
Brad King
9cb685505a
Merge topic 'update-libarchive'
...
52f58267
Merge branch 'upstream-LibArchive' into update-libarchive
2b94d71d
LibArchive 2016-06-19 (139d0576)
2016-06-21 13:57:07 -04:00
Brad King
447f0618db
Merge topic 'FindBoost-imported-fallback-to-release'
...
c9fca42f
FindBoost: Make imported targets fall back to `Release`
2016-06-21 13:57:04 -04:00
Brad King
736ffc627c
Merge topic 'aix-clang'
...
5cc34162
AIX: Add support for Clang compiler
2016-06-21 13:57:02 -04:00
Brad King
b70f18379b
Merge topic 'refactor-flags'
...
41925efe
cmGeneratorTarget: Fix Fortran module directory regression
2016-06-21 13:56:59 -04:00
Brad King
41925efe76
cmGeneratorTarget: Fix Fortran module directory regression
...
Refactoring in commit 49f10f0d
(cmGeneratorTarget: Adopt Fortran module
directory generation, 2016-06-10) accidentally made a local variable
declared `static` causing results to be re-used incorrectly.
2016-06-21 13:37:06 -04:00
Brad King
c41dfdabdd
Merge branch 'doc-VS_STARTUP_PROJECT-clarify' into release
2016-06-21 09:34:47 -04:00
Brad King
d3e538eabb
Help: Clarify VS_STARTUP_PROJECT documentation
...
Explain in what directory the property should be set to affect the
corresponding ``.sln`` file.
Suggested-by: Stephen Kelly <steveire@gmail.com>
2016-06-21 09:33:35 -04:00
Brad King
4bb8351414
FindZLIB: Do not mark unused variable as advanced
...
We no longer define the ZLIB_LIBRARY cache entry, so we should not mark
it as advanced either. We only use this variable when someone else
defines it in order to remain compatible with older versions of this
module, but we never create the entry ourselves anymore.
2016-06-21 08:56:56 -04:00
Laurent Tarrisse
867b73e275
GetPrerequisites: Optimize on Windows by filtering `objdump` output
...
Extend the optimization from commit v3.4.0-rc1~264^2 (GetPrerequisites:
Optionally filter "objdump" output for speed, 2015-07-29) to work
on Windows by using `findstr` in place of `grep`.
2016-06-21 08:48:09 -04:00
Kitware Robot
76c186b72f
CMake Nightly Date Stamp
2016-06-21 00:01:11 -04:00
Daniel Pfeifer
8ddbd4c280
cmOutputConverter: remove unnecessary conversion
2016-06-20 23:18:59 +02:00
Daniel Pfeifer
bdaadbdc2b
cmOutputConverter: collapse ConvertToOutputForExisting functions
2016-06-20 23:11:05 +02:00
Daniel Pfeifer
191fc3a0f3
cmOutputConverter: remove unused 'local' argument
2016-06-20 23:03:28 +02:00
Daniel Pfeifer
b86007e385
cmOutputConverter: remove 'optional' argument
...
Remove the 'optional' paramenter from the second overload of the Convert
function. This parameter is used from one single location. Inline the
codepath for which the argument is true to the callsite.
2016-06-20 22:32:02 +02:00
Daniel Pfeifer
cde127b084
cmOutputConverter::Convert: invert condition
...
Make the control flow of the 'optional' argument more explicit.
2016-06-20 22:12:36 +02:00
Daniel Pfeifer
c23f89bc76
cmOutputConverter::Convert: make precondition explicit
2016-06-20 22:11:20 +02:00
Jean-Christophe Fillion-Robin
6509ad29f6
CTest: Properly set buildname if only C langage is enabled
...
Fixes #14068
2016-06-20 15:45:25 -04:00
FARBOS Arnaud
6087b9e439
FindGLEW: Search for debug and release configurations separately
2016-06-20 15:07:32 -04:00
Ivan Ivanov
eecd307e24
FindLua: Iterate through all include subdirs to find a suitable header
...
Fixes #15756 .
2016-06-20 14:46:06 -04:00
Ivan Ivanov
3532cbce18
FindLua: Check header file against suitable versions
2016-06-20 14:40:40 -04:00
Ivan Ivanov
281c707b65
FindLua: Factor out a helper function for version extraction
2016-06-20 14:38:32 -04:00
Ivan Ivanov
92c67b9f01
FindLua: Prefix private APIs with `_lua_`
2016-06-20 14:37:49 -04:00
Brad King
cd1f1cb544
Merge topic 'cmDependsJavaParserHelper-dangling-ptr'
...
fe27879c
cmDependsJavaParserHelper: fix dangling pointer
2016-06-20 10:58:10 -04:00
Daniel Pfeifer
fe27879c6b
cmDependsJavaParserHelper: fix dangling pointer
...
The cmDependsJavaParserHelper tries to implement a "deep copy" in the
assignment operator of the internal class CurrentClass. To do that, it
uses std::copy and std::back_inserter. The copy constructor is
implemented in terms of the assignment operator but it does not
initialize the member NestedClasses, a pointer to vector. This pointer
is dereferenced in the assignment operator. Change the pointer to a
value and rely on the compiler generated special functions.
2016-06-20 10:56:39 -04:00
Brad King
d38fc22132
Merge branch 'update-libarchive' into release
2016-06-20 10:53:25 -04:00
Brad King
52f58267c3
Merge branch 'upstream-LibArchive' into update-libarchive
...
* upstream-LibArchive:
LibArchive 2016-06-19 (139d0576)
2016-06-20 10:50:13 -04:00
LibArchive Upstream
2b94d71d88
LibArchive 2016-06-19 (139d0576)
...
Code extracted from:
https://github.com/libarchive/libarchive.git
at commit 139d0576b51a253732a5ab1f66805dffbf8b00af (master).
2016-06-20 10:50:05 -04:00
Andreas Weis
c9fca42fd1
FindBoost: Make imported targets fall back to `Release`
...
FindBoost only detects Debug and Release configurations. All other
configurations will fall back to the configuration listed as the first
entry in `IMPORTED_CONFIGURATIONS`. Switch the order so that `Release`
is listed first, as this is a better fallback than `Debug` for the
`RelWithDebInfo` and `MinSizeRel` configurations. See issue #16091 .
2016-06-20 10:14:10 -04:00
Brad King
313e966702
Merge branch 'release'
2016-06-20 10:05:34 -04:00
Wu Zhao
5cc34162ad
AIX: Add support for Clang compiler
...
The platform information module for GNU on AIX can be reused for Clang
on AIX because clang accepts almost all of the same options.
2016-06-20 09:59:31 -04:00
Brad King
74fde78311
Merge topic 'cmake-trace-source'
...
e63151ff
cmake: Add an option to control what files needs to be traced
2016-06-20 09:56:06 -04:00
Brad King
efb6d317e3
Merge topic 'FindQt4-doc-QtDeclarative-imported'
...
5ed2881c
FindQt4: Document Qt4::QtDeclarative imported target (#16157 )
2016-06-20 09:56:04 -04:00
Brad King
e2d700bd97
Merge topic 'cpack-deb-test-fixes'
...
6107fab4
CPack/Deb: Fix test to actually test the preinst script
302391ba
CPack/Deb: Fix tests for SELinux-enabled systems
2016-06-20 09:56:01 -04:00
Brad King
95c5e00186
Merge topic 'pkgconfig-targets'
...
8345c646
FindPkgConfig: define the imported targets also when the data comes from cache
2016-06-20 09:55:59 -04:00
Brad King
711caeb3bd
Merge topic 'refactor-flags'
...
802b36fb
cmExtraSublimeTextGenerator: Use GetTargetCompileFlags
3c488ce8
cmLocalGenerator: Adopt target compile flag generation
5467e794
cmLocalGenerator: Add method to get Fortran-specific compiler flags
49f10f0d
cmGeneratorTarget: Adopt Fortran module directory generation
0392f72b
Refactor Makefile/Ninja tool working directory storage
2016-06-20 09:55:56 -04:00
Brad King
af0f1e4f22
Merge topic 'cmake-gui-Qt-LGPLv3'
...
9ad10c8f
cmake-gui: Reference LGPLv3 when redistributing Qt
2016-06-20 09:55:54 -04:00
Brad King
5f3bfab7b7
Merge topic 'FindFreetype-debug-lib'
...
b213a7f6
FindFreetype: Find release and debug libraries separately
2016-06-20 09:55:52 -04:00
Brad King
5c7b2aafbd
Merge topic 'revert-vs-clang-minsize'
...
78249be2
VS: Fix regressed mapping for the cl `/Os` compiler flag
2016-06-20 09:55:48 -04:00