summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'findcups'Brad King2019-02-076-9/+85
|\ | | | | | | | | | | | | dd45f23b01 FindCups: add imported target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2917
| * FindCups: add imported targetPatrick Gansterer2019-02-066-9/+85
| |
* | Merge topic 'test-FortranModules-tweak'Brad King2019-02-071-0/+1
|\ \ | | | | | | | | | | | | | | | | | | 562ea5d0e2 Tests: Add a way to configure custom options for FortranModules test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2926
| * | Tests: Add a way to configure custom options for FortranModules testBrad King2019-02-061-0/+1
| |/ | | | | | | | | Read an undocumented cache entry to allow some CI builds to configure this test in a special way.
* | Merge branch 'release-3.14'Brad King2019-02-070-0/+0
|\ \
| * \ Merge branch 'cpack-ifw-error-wording' into release-3.14v3.14.0-rc1Brad King2019-02-071-1/+1
| |\ \ | | | | | | | | | | | | Merge-request: !2928
| * \ \ Merge branch 'FindHDF5-cleanup' into release-3.14Brad King2019-02-071-59/+81
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2916
| * \ \ \ Merge branch 'xcode-stdlib-flags' into release-3.14Brad King2019-02-073-0/+26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2919
| * \ \ \ \ Merge branch 'vs-csharp-nowarn-numbers' into release-3.14Brad King2019-02-0712-16/+132
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2923
* | \ \ \ \ \ Merge topic 'cpack-ifw-error-wording'Brad King2019-02-071-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60a8d4c5f4 CPack/IFW: Correct wording in error message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2928
| * | | | | | CPack/IFW: Correct wording in error messageJoachim Wuttke (o)2019-02-071-1/+1
| | | | | | |
* | | | | | | Merge topic 'FindHDF5-cleanup'Brad King2019-02-071-59/+81
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3d9e6b760 FindHDF5: Modernize formatting of variable documentation acbd69c219 FindHDF5: Use execute_process instead of exec_program Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2916
| * | | | | | FindHDF5: Modernize formatting of variable documentationMichael Hirsch, Ph.D2019-02-071-49/+69
| | | | | | |
| * | | | | | FindHDF5: Use execute_process instead of exec_programMichael Hirsch, Ph.D2019-02-071-10/+12
| |/ / / / /
* | | | | | Merge topic 'xcode-stdlib-flags'Brad King2019-02-073-0/+26
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8af334f5ba Xcode: Derive stdlib from CXX flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2919
| * | | | | Xcode: Derive stdlib from CXX flagsGregor Jasny2019-02-073-0/+26
| |/ / / / | | | | | | | | | | | | | | | Closes: #18396
* | | | | Merge topic 'vs-csharp-nowarn-numbers'Brad King2019-02-0712-16/+132
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 822697996e VS: Fix nowarn compiler option to accept warning numbers. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2923
| * | | | VS: Fix nowarn compiler option to accept warning numbers.Wil Stark2019-02-0712-16/+132
| |/ / / | | | | | | | | | | | | | | | | | | | | Warning disables are transferred to the VS IDE `<NoWarn>` node. Fixes: #18878
* | | | CMake Nightly Date StampKitware Robot2019-02-071-1/+1
| |_|/ |/| |
* | | Begin post-3.14 developmentBrad King2019-02-063-2/+11
| | |
* | | Merge branch 'release-3.14'Brad King2019-02-064-13/+4
|\ \ \ | |/ / |/| / | |/
| * CMake 3.14.0-rc1 version updateBrad King2019-02-062-4/+4
| |
| * Help: Drop development topic notes to prepare releaseBrad King2019-02-062-9/+0
|/ | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* Merge topic 'doc-3.14-relnotes'Brad King2019-02-0665-413/+342
|\ | | | | | | | | | | | | | | aa9161fd57 Help: Organize and revise 3.14 release notes 0d1a9282c4 Help: Consolidate 3.14 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2925
| * Help: Organize and revise 3.14 release notesBrad King2019-02-061-154/+200
| | | | | | | | | | Add section headers similar to the 3.13 release notes and move each individual bullet into an appropriate section. Revise a few bullets.
| * Help: Consolidate 3.14 release notesBrad King2019-02-0665-413/+296
|/ | | | | Run the `Utilities/Release/consolidate-relnotes.bash` script to move notes from `Help/release/dev/*` into `Help/release/3.14.rst`.
* Merge topic 'deprecate-xcode-4'Brad King2019-02-062-1/+9
|\ | | | | | | | | | | | | 75a75d2754 Xcode: deprecate support for Xcode 4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2922
| * Xcode: deprecate support for Xcode 4Gregor Jasny2019-02-062-1/+9
| |
* | Merge topic 'relax_CUDA_RESOLVE_DEVICE_SYMBOLS_constraints'Brad King2019-02-0611-35/+219
|\ \ | | | | | | | | | | | | | | | | | | | | | 850ef90a66 CUDA: Honor CUDA_RESOLVE_DEVICE_SYMBOLS for more target types Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !2900
| * | CUDA: Honor CUDA_RESOLVE_DEVICE_SYMBOLS for more target typesRobert Maynard2019-02-0511-35/+219
| | | | | | | | | | | | | | | | | | | | | `CUDA_RESOLVE_DEVICE_SYMBOLS` can be used with shared, module, and executable target types. This relaxation is to allow for better interoperability with linkers that automatically do CUDA device symbol resolution and have no way to disable it.
* | | Merge topic 'autogen_same_name_different_extension'Brad King2019-02-068-14/+103
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a28caabf45 Autogen: AUTOMOC support for files with the same name but different extensions 1f802295f2 Autogen: Extend the SameName test with same name but different extension files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2920
| * | | Autogen: AUTOMOC support for files with the same name but different extensionsSebastian Holtermann2019-02-052-13/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for AUTOMOC to moc header files with the same but different extensions (e.g `obj.h`, `obj.hpp`, `obj.hxx`). If a moc file would appear multiple times in `mocs_compilation.cpp`, a number suffix is appended to the name to make it unique. Closes #14489
| * | | Autogen: Extend the SameName test with same name but different extension filesSebastian Holtermann2019-02-056-1/+68
| | |/ | |/|
* | | CMake Nightly Date StampKitware Robot2019-02-061-1/+1
|/ /
* | Merge topic 'update-kwsys'Brad King2019-02-051-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | 9ddbf4c6e6 Merge branch 'upstream-KWSys' into update-kwsys 8372c05472 KWSys 2019-02-05 (65802a20) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2918
| * \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-02-051-1/+2
| |\ \ | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2019-02-05 (65802a20)
| | * | KWSys 2019-02-05 (65802a20)KWSys Upstream2019-02-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 65802a20ec4b9a774518151c3f8772e082163601 (master). Upstream Shortlog ----------------- Nicolae Vartolomei (1): d1536b02 macOS: Better approximation for AvailablePhysicalMemory
* | | | Merge topic 'autogen_single_all_sources_iteration'Brad King2019-02-054-85/+85
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6cf086267 Autogen: Iterate over makefile sources only once ed0fa784eb cmSystemTools: Let `GetFileFormat` accept a `std::stding const&` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2909
| * | | | Autogen: Iterate over makefile sources only onceSebastian Holtermann2019-02-021-78/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QtAutoGen we used to iterate over all makefile source two times to extract file parameters for moc and uic respectively. This patch merges both iterations into one loop. This makes the code easier to understand and likely faster to execute as well.
| * | | | cmSystemTools: Let `GetFileFormat` accept a `std::stding const&`Sebastian Holtermann2019-02-024-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | The `const char*` used formerly was converted to a `std::string` internally anyway.
* | | | | Merge topic 'vs-fortran-target-check'Brad King2019-02-052-19/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3d2c3cd49 VS: Fix Fortran target type selection when linking C++ targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2913
| * | | | | VS: Fix Fortran target type selection when linking C++ targetsBrad King2019-02-042-19/+17
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 2c9f35789d (VS: Decide project type by linker lang as fallback, 2017-03-30, v3.9.0-rc1~340^2) we consider the linker language when detecting whether to generate a `.vfproj` or `.vcxproj` file. However, this could cause C-only projects to become `.vfproj` files if they link to Fortran projects. Instead we should consider only the `LINKER_LANGUAGE` property on the target itself. This approach is already used for CSharp. It allows project code to specify the project file type for a target with no sources but does not allow linked targets to affect it. Fixes: #18687
* | | | | Merge topic '17870-iphone-friendly-cmake'Brad King2019-02-0526-111/+215
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8ee8cab97 Xcode: Completely disable code signing for compiler id detection 11da882a12 Apple: Introduce separate system name for iOS, tvOS, and watchOS 36cf44a7a3 Tests: Isolate RunCMake.XcodeProject per-device cases from host arch Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2392
| * | | | | Xcode: Completely disable code signing for compiler id detectionGregor Jasny2019-02-043-14/+3
| | | | | | | | | | | | | | | | | | | | | | | | Issue: #17870
| * | | | | Apple: Introduce separate system name for iOS, tvOS, and watchOSGregor Jasny2019-02-0425-68/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove code signing requirements for non-macOS - Do not set deployment target for non-macOS - Build static library for compiler feature detection for non-macOS - Use framework to run CompilerId tests for watchOS - Port tests to new SDK handling - Add new Apple cross-compiling section to toolchain documentation Closes: #17870
| * | | | | Tests: Isolate RunCMake.XcodeProject per-device cases from host archBrad King2019-02-041-30/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run all host cases before per-device cases. Do not expose the host `CMAKE_OSX_ARCHITECTURES` environment value to the per-device tests.
* | | | | | Merge topic 'swift-xcode-10.2'Brad King2019-02-054-3/+13
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96dece6dc1 Xcode: Update default Swift language version for Xcode 10.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2912
| * | | | | Xcode: Update default Swift language version for Xcode 10.2Brad King2019-02-044-3/+13
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Xcode 10.2 no longer supports Swift language versions before 4.0. Fixes: #18871
* | | | | CMake Nightly Date StampKitware Robot2019-02-051-1/+1
|/ / / /
* | | | Merge topic 'cmSourceFile_refactor'Brad King2019-02-0413-84/+112
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 254b7260f4 cmSourceFile: Check if a file is GENERATED first in the full path computation cd8a930d61 cmSourceFile: Refactor FindFullPath method 6d407ae439 Use cmSourceFile::GetIsGenerated 2ddf3f4467 cmSourceFile: Add IsGenerated method b9d44fc350 cmSourceFile: Additional static property strings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2908