summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Genex: Add `TARGET_BUNDLE_[CONTENT_]_DIR` generator expressionsGregor Jasny2017-03-3019-2/+177
| | | | Closes #16733
* cmGeneratorTarget: Call GetFrameworkDirectory in GetFullNameInternalGregor Jasny2017-03-301-7/+1
|
* cmGeneratorTarget: Use enum to describe bundle directory query levelGregor Jasny2017-03-303-36/+56
|
* Merge branch 'release'Brad King2017-03-300-0/+0
|\
| * CMake 3.8.0-rc4v3.8.0-rc4Brad King2017-03-301-1/+1
| |
* | Merge branch 'release'Brad King2017-03-300-0/+0
|\ \ | |/
| * Merge branch 'FindBoost-1.64-deps' into releaseBrad King2017-03-301-0/+1
| |\
| * \ Merge branch 'sdcc-compiler-id' into releaseBrad King2017-03-291-2/+8
| |\ \
| * \ \ Merge branch '16742-swift-3.0' into releaseBrad King2017-03-294-9/+15
| |\ \ \
* | \ \ \ Merge topic '10749-aix-version'Brad King2017-03-301-1/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01a8a201 AIX: Properly detect host system version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !645
| * | | | | AIX: Properly detect host system versionGregor Jasny2017-03-291-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMakeDetermineSystem.cmake uses "uname -r" to get CMAKE_HOST_SYSTEM_VERSION on AIX. AIX uses "uname -v" for the major version and "uname -r" for the minor version. Thanks to Chris Taylor for the suggested patch. Closes #10749
* | | | | | Merge topic 'ctest-disable-tests'Brad King2017-03-3025-19/+304
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b070947d Add 'DISABLED' test property 42c68aad CTest: Improve 'Completion Status' reported to CDash for 'Not Run' tests Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Brad King <brad.king@kitware.com> Merge-request: !571
| * | | | | | Add 'DISABLED' test propertyBetsy McPhail2017-03-2925-8/+289
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this property is set, the test is skipped and its status is automatically set to 'Not Run'. A disabled test will not be counted in the total number of tests and its completion status will be 'Disabled'.
| * | | | | | CTest: Improve 'Completion Status' reported to CDash for 'Not Run' testsBetsy McPhail2017-03-272-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the completion status of not run tests was always set to "Not Run". Make it more descriptive. This value is written to `Test.xml` and then displayed as 'Test Details' in CDash.
* | | | | | | Merge topic 'sdcc-compiler-id'Brad King2017-03-301-2/+8
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5695558f SDCC: Fix identification of current sdcc compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !644
| * | | | | | SDCC: Fix identification of current sdcc compilerBrad King2017-03-291-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sdcc compiler no longer defines the `SDCC` preprocessor macro. Instead `__SDCC_VERSION_MAJOR` and similar component-wise macros are defined. Use them instead if defined. Issue: #16746
* | | | | | | Merge topic 'iwyu'Brad King2017-03-305-9/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48cfb295 cmFortranParser: remove unnecessary typedef 90bb5f64 cmCommandArgumentParserHelper: remove unnecessary include ab5f4e81 cmFortranParserImpl: remove unnecessary include f8ed8bef testEncoding: use cmsys::ifstream 8647c6cd testEncoding: include <cmsys/ConsoleBuf.hxx> on Windows only 21a6ed49 cmFileCommand: add <cm_curl.h> include a2275bdd cmFileCommand: remove unnecessary friend declaration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !626
| * | | | | | | cmFortranParser: remove unnecessary typedefDaniel Pfeifer2017-03-291-2/+1
| | | | | | | |
| * | | | | | | cmCommandArgumentParserHelper: remove unnecessary includeDaniel Pfeifer2017-03-291-2/+0
| | | | | | | |
| * | | | | | | cmFortranParserImpl: remove unnecessary includeDaniel Pfeifer2017-03-291-1/+0
| | | | | | | |
| * | | | | | | testEncoding: use cmsys::ifstreamDaniel Pfeifer2017-03-291-2/+2
| | | | | | | |
| * | | | | | | testEncoding: include <cmsys/ConsoleBuf.hxx> on Windows onlyDaniel Pfeifer2017-03-291-0/+2
| | | | | | | |
| * | | | | | | cmFileCommand: add <cm_curl.h> includeDaniel Pfeifer2017-03-291-0/+1
| | | | | | | |
| * | | | | | | cmFileCommand: remove unnecessary friend declarationDaniel Pfeifer2017-03-291-2/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'cmake-file-install-symlink-on-nonexistng-path'Brad King2017-03-305-0/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e8f1118 handle non-existing symlink creation locations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !642
| * | | | | | | handle non-existing symlink creation locationsDomen Vrankar2017-03-285-0/+23
| | | | | | | |
* | | | | | | | Merge topic 'FindBoost-1.64-deps'Brad King2017-03-301-0/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 556d98da FindBoost: Update 1.64 dependencies using 1.64 beta1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !629
| * | | | | | | FindBoost: Update 1.64 dependencies using 1.64 beta1Roger Leigh2017-03-301-0/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic '16742-swift-3.0'Brad King2017-03-304-9/+15
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77139e32 Swift: Simplify mixed test case to make it version agnostic c03141c0 Swift: Default to Swift 3.0 with Xcode 8.3 and later Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !638
| * | | | | | Swift: Simplify mixed test case to make it version agnosticGregor Jasny2017-03-292-20/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #16742
| * | | | | | Swift: Default to Swift 3.0 with Xcode 8.3 and laterGregor Jasny2017-03-284-3/+26
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 8.3 has dropped support for Swift 2.3 so that compiler and feature detection failed. Closes #16742
* | | | | | CMake Nightly Date StampKitware Robot2017-03-301-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'release'Brad King2017-03-290-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'vs-rc-defines' into releaseBrad King2017-03-296-7/+37
| |\ \ \ \
* | \ \ \ \ Merge topic 'vs-rc-defines'Brad King2017-03-296-7/+37
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fff34934 MSVC: Restore _DEBUG preprocessor definition in RC debug builds 79a91538 RC: Add missing CMAKE_RC_FLAGS_<CONFIG> entries to cache c77194ec VS: Honor preprocessor definitions in RC flags 1449f6f6 cmVisualStudio10TargetGenerator: De-duplicate preprocessor defs 8a619e8c cmIDEOptions: Add GetDefines method Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !640
| * | | | | MSVC: Restore _DEBUG preprocessor definition in RC debug buildsBrad King2017-03-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.8.0-rc1~304^2 (MSVC: Do not define _DEBUG explicitly when using /MDd, 2016-11-15) we removed the `_DEBUG` preprocessor definition from MSVC C and C++ flags because the `cl` compiler automatically defines it in Debug builds anyway. However, the VS generators propagate C preprocessor definitions to the RC (Windows Resource Compiler) tool. This means that we used to explicitly define `_DEBUG` for RC debug builds. Therefore existing project code may expect the definition to be there even though the `rc` compiler itself does not implicitly define `_DEBUG` in debug builds. Add the `_DEBUG` flag to the default `CMAKE_RC_FLAGS_DEBUG` instead to restore this definition for RC debug builds. This also makes it available consistently in VS, Ninja, and Makefile generators. Fixes: #16745
| * | | | | RC: Add missing CMAKE_RC_FLAGS_<CONFIG> entries to cacheBrad King2017-03-281-1/+16
| | | | | |
| * | | | | VS: Honor preprocessor definitions in RC flagsBrad King2017-03-281-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VS generators use the C (or CXX) preprocessor definitions for the Windows Resource Compiler tool. This causes definitions parsed out of `CMAKE_RC_FLAGS[_<CONFIG>]` variables to be dropped. Fix the implementation to preserve both. Issue: #16745
| * | | | | cmVisualStudio10TargetGenerator: De-duplicate preprocessor defsBrad King2017-03-281-1/+4
| | | | | |
| * | | | | cmIDEOptions: Add GetDefines methodBrad King2017-03-282-0/+7
| | |/ / / | |/| | |
* | | | | Merge topic 'update-kwsys'Brad King2017-03-291-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cdd2875a Merge branch 'upstream-KWSys' into update-kwsys e9c5505b KWSys 2017-03-28 (34999b6a) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !637
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-03-281-2/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-03-28 (34999b6a)
| | * | | | KWSys 2017-03-28 (34999b6a)KWSys Upstream2017-03-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 34999b6ab815d1456818f4517338a15be7f89ea0 (master). Upstream Shortlog ----------------- Daniel Pfeifer (1): 6f43bcef FStream: Make (i|o)fstream::is_open function public
* | | | | | Merge topic 'vfproj-object-libs-fix'Brad King2017-03-291-4/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a411dfb VS: Fix OBJECT library support in Intel Fortran projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !636
| * | | | | | VS: Fix OBJECT library support in Intel Fortran projectsChristian Pfeiffer2017-03-281-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `TargetExt` for `.vfproj` object libraries should be `.lib` to match the `OutputFile` value. Otherwise Visual Fortran raises warnings: TargetPath(...) does not match the Library's OutputFile property value (...)
* | | | | | | Merge topic 'sphinx-cmake-theme'Brad King2017-03-291-0/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62b85c94 Utilities/Sphinx: Use brighter colors for html theme Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !641
| * | | | | | | Utilities/Sphinx: Use brighter colors for html themeMatthew Woehlke2017-03-281-0/+20
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Set Sphinx `html_theme_options` to give the generated documentation a brighter and softer look than the default colors.
* | | | | | | CMake Nightly Date StampKitware Robot2017-03-291-1/+1
|/ / / / / /
* | | | | | Merge branch 'release'Brad King2017-03-280-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'libarchive-backport-zip-dir-fix' into releaseBrad King2017-03-271-16/+20
| |\ \ \ \ \