summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make C++ feature checks extensibleDaniel Pfeifer2016-06-2710-39/+50
| | | | | | Turn the feature check for cxx11_unordered_map into a function such that we can use it for other features as well. Drop the 11 suffix, as we may want to check features from other standards.
* Merge branch 'release'Brad King2016-06-220-0/+0
|\
| * CMake 3.6.0-rc3v3.6.0-rc3Brad King2016-06-221-1/+1
| |
* | Merge branch 'release'Brad King2016-06-220-0/+0
|\ \ | |/
| * Merge branch 'doc-VS_STARTUP_PROJECT-clarify' into releaseBrad King2016-06-211-1/+7
| |\
| * \ Merge branch 'update-libarchive' into releaseBrad King2016-06-2019-49/+88
| |\ \
* | \ \ Merge topic 'FindZLIB-fixup'Brad King2016-06-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4bb83514 FindZLIB: Do not mark unused variable as advanced
| * | | | FindZLIB: Do not mark unused variable as advancedBrad King2016-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge topic 'GetPrerequisites-findstr'Brad King2016-06-221-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 867b73e2 GetPrerequisites: Optimize on Windows by filtering `objdump` output
| * | | | | GetPrerequisites: Optimize on Windows by filtering `objdump` outputLaurent Tarrisse2016-06-211-1/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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`.
* | | | | Merge topic 'doc-VS_STARTUP_PROJECT-clarify'Brad King2016-06-221-1/+7
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | d3e538ea Help: Clarify VS_STARTUP_PROJECT documentation
| * | | | Help: Clarify VS_STARTUP_PROJECT documentationBrad King2016-06-211-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain in what directory the property should be set to affect the corresponding ``.sln`` file. Suggested-by: Stephen Kelly <steveire@gmail.com>
* | | | | CMake Nightly Date StampKitware Robot2016-06-221-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2016-06-210-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'cpack-deb-test-fixes' into releaseBrad King2016-06-203-10/+13
| |\ \ \ \
| * \ \ \ \ Merge branch 'pkgconfig-targets' into releaseBrad King2016-06-201-2/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'FindQt4-doc-QtDeclarative-imported' into releaseBrad King2016-06-201-0/+2
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'output-converter'Brad King2016-06-214-48/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | cmOutputConverter: remove unnecessary conversionDaniel Pfeifer2016-06-201-6/+4
| | | | | | | | |
| * | | | | | | | cmOutputConverter: collapse ConvertToOutputForExisting functionsDaniel Pfeifer2016-06-202-22/+6
| | | | | | | | |
| * | | | | | | | cmOutputConverter: remove unused 'local' argumentDaniel Pfeifer2016-06-204-15/+8
| | | | | | | | |
| * | | | | | | | cmOutputConverter: remove 'optional' argumentDaniel Pfeifer2016-06-202-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | cmOutputConverter::Convert: invert conditionDaniel Pfeifer2016-06-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the control flow of the 'optional' argument more explicit.
| * | | | | | | | cmOutputConverter::Convert: make precondition explicitDaniel Pfeifer2016-06-201-2/+4
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge topic '14068-ctest-target-set-buildname-with-only-c-compiler'Brad King2016-06-211-6/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6509ad29 CTest: Properly set buildname if only C langage is enabled
| * | | | | | | | CTest: Properly set buildname if only C langage is enabledJean-Christophe Fillion-Robin2016-06-201-6/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes #14068
* | | | | | | | Merge topic 'FindGLEW-debug'Brad King2016-06-211-9/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6087b9e4 FindGLEW: Search for debug and release configurations separately
| * | | | | | | | FindGLEW: Search for debug and release configurations separatelyFARBOS Arnaud2016-06-201-9/+34
| |/ / / / / / /
* | | | | | | | Merge topic 'FindLua-match-header-and-lib'Brad King2016-06-211-45/+72
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_`
| * | | | | | | | FindLua: Iterate through all include subdirs to find a suitable headerIvan Ivanov2016-06-201-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #15756.
| * | | | | | | | FindLua: Check header file against suitable versionsIvan Ivanov2016-06-201-5/+12
| | | | | | | | |
| * | | | | | | | FindLua: Factor out a helper function for version extractionIvan Ivanov2016-06-201-23/+30
| | | | | | | | |
| * | | | | | | | FindLua: Prefix private APIs with `_lua_`Ivan Ivanov2016-06-201-8/+8
| |/ / / / / / /
* | | | | | | | Merge topic 'update-libarchive'Brad King2016-06-2119-49/+88
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52f58267 Merge branch 'upstream-LibArchive' into update-libarchive 2b94d71d LibArchive 2016-06-19 (139d0576)
| * | | | | | | Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2016-06-2019-49/+88
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-LibArchive: LibArchive 2016-06-19 (139d0576)
| | * | | | | | | LibArchive 2016-06-19 (139d0576)LibArchive Upstream2016-06-2022-52/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libarchive/libarchive.git at commit 139d0576b51a253732a5ab1f66805dffbf8b00af (master).
* | | | | | | | | Merge topic 'FindBoost-imported-fallback-to-release'Brad King2016-06-211-7/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9fca42f FindBoost: Make imported targets fall back to `Release`
| * | | | | | | | | FindBoost: Make imported targets fall back to `Release`Andreas Weis2016-06-201-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | Merge topic 'aix-clang'Brad King2016-06-213-0/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5cc34162 AIX: Add support for Clang compiler
| * | | | | | | | | | AIX: Add support for Clang compilerWu Zhao2016-06-203-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The platform information module for GNU on AIX can be reused for Clang on AIX because clang accepts almost all of the same options.
* | | | | | | | | | | Merge topic 'refactor-flags'Brad King2016-06-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41925efe cmGeneratorTarget: Fix Fortran module directory regression
| * | | | | | | | | | | cmGeneratorTarget: Fix Fortran module directory regressionBrad King2016-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2016-06-211-1/+1
| |_|_|_|_|/ / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge topic 'cmDependsJavaParserHelper-dangling-ptr'Brad King2016-06-202-37/+19
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe27879c cmDependsJavaParserHelper: fix dangling pointer
| * | | | | | | | | | cmDependsJavaParserHelper: fix dangling pointerDaniel Pfeifer2016-06-202-37/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | Merge branch 'release'Brad King2016-06-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'doc-issue-tracker-move' into releaseBrad King2016-06-171-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'CodeBlocks-include-order' into releaseBrad King2016-06-171-7/+11
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'revert-vs-clang-minsize' into releaseBrad King2016-06-172-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'cmake-trace-source'Brad King2016-06-2010-1/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e63151ff cmake: Add an option to control what files needs to be traced