summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'gnuid-cmp54-fix'Brad King2017-10-241-0/+5
|\ | | | | | | | | | | | | a8be8b1b GNUInstallDirs: Enable CMP0054 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1400
| * GNUInstallDirs: Enable CMP0054Christian Pfeiffer2017-10-231-0/+5
| | | | | | | | Fixes: #17381
* | Merge topic 'doc-cxx-std-msvc'Brad King2017-10-242-2/+4
|\ \ | | | | | | | | | | | | | | | | | | e0587669 Help: Correct <LANG>_STANDARD help w.r.t. MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1401
| * | Help: Correct <LANG>_STANDARD help w.r.t. MSVCChristian Pfeiffer2017-10-232-2/+4
| |/ | | | | | | Fixes: #17380
* | Merge topic 'generator-instance'Brad King2017-10-2438-18/+330
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ffb3538 VS: Select and save a VS 2017 instance persistently 17edfa41 cmVSSetupHelper: Add option to specify an instance a19b8113 CheckLanguage: Pass generator instance into check 6b3cd64d ExternalProject: Propagate the generator instance 314613d1 Add infrastructure for generators to select a build tool instance Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1394
| * | VS: Select and save a VS 2017 instance persistentlyBrad King2017-10-1916-24/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio 2017 supports multiple instances installed on a single machine. We use the Visual Studio Installer tool to enumerate instances and select one. Once we select an instance for a given build tree, save the result in `CMAKE_GENERATOR_INSTANCE` so we can re-configure the tree with the same instance on future re-runs of CMake. Fixes: #17268
| * | cmVSSetupHelper: Add option to specify an instanceBrad King2017-10-192-4/+29
| | |
| * | CheckLanguage: Pass generator instance into checkBrad King2017-10-191-0/+6
| | | | | | | | | | | | | | | Otherwise we do not check for support for the language with the same generator instance as the caller.
| * | ExternalProject: Propagate the generator instanceBrad King2017-10-191-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | When the `CMAKE_GENERATOR` option is given to `ExternalProject_Add`, look also for option `CMAKE_GENERATOR_INSTANCE` to pass on to cmake as a cache definition. When no `CMAKE_GENERATOR` option is given explicitly then use the current project's `CMAKE_GENERATOR_INSTANCE` (since we already use its CMAKE_GENERATOR).
| * | Add infrastructure for generators to select a build tool instanceBrad King2017-10-1922-0/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cache entry `CMAKE_GENERATOR_INSTANCE` to hold the instance location persistently across re-runs of CMake in a given build tree. For now we reject the option by default if explicitly set. It will be implemented on a per-generator basis. Pass the setting into try_compile project generation. Add a RunCMake.GeneratorInstance test to cover basic use cases for the option. Verify that `CMAKE_GENERATOR_INSTANCE` is empty by default, and that it is rejected when the generator does not support a user setting. Issue: #17268
* | | CMake Nightly Date StampKitware Robot2017-10-241-1/+1
| | |
* | | Merge branch 'release-3.10'Brad King2017-10-230-0/+0
|\ \ \
| * \ \ Merge branch 'flang-remove-boundscheck' into release-3.10Brad King2017-10-191-2/+0
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1393
* | \ \ \ Merge topic 'flang-remove-boundscheck'Brad King2017-10-231-2/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 3aeff21d Flang: Remove unsupported fbounds-check flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1393
| * | | | Flang: Remove unsupported fbounds-check flagChristian Pfeiffer2017-10-191-2/+0
| | |_|/ | |/| | | | | | | | | | | | | | The Flang compiler neither supports nor documents -fbounds-check leading to -Wunused-command-line-argument warnings with the default Debug flags.
* | | | CMake Nightly Date StampKitware Robot2017-10-231-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-10-221-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-10-211-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-10-201-1/+1
| | | |
* | | | Merge branch 'release-3.10'Brad King2017-10-190-0/+0
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | CMake 3.10.0-rc3v3.10.0-rc3Brad King2017-10-191-1/+1
| | |
* | | Merge topic 'curl_netrc_options'Brad King2017-10-1920-4/+277
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d45aa38a Add dev notes for topic 'curl_netrc_options' 60c272b6 ExternalProject: Add support for NETRC and NETRC_FILE suboption 754e39dd Add testcases for file(DOWNLOAD|UPLOAD) netrc options 5d67e902 file(DOWNLOAD|UPLOAD): Add 'NETRC' and 'NETRC_FILE' suboption Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ruslan Baratov <ruslan_baratov@yahoo.com> Merge-request: !1376
| * | | Add dev notes for topic 'curl_netrc_options'Shane Parris2017-10-181-0/+14
| | | |
| * | | ExternalProject: Add support for NETRC and NETRC_FILE suboptionShane Parris2017-10-183-3/+47
| | | |
| * | | Add testcases for file(DOWNLOAD|UPLOAD) netrc optionsShane Parris2017-10-189-0/+72
| | | |
| * | | file(DOWNLOAD|UPLOAD): Add 'NETRC' and 'NETRC_FILE' suboptionShane Parris2017-10-188-1/+144
| | | |
* | | | Merge topic 'ti-compiler-depfile-support'Brad King2017-10-193-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad9327d9 Compiler/TI: Add support for depfile generation for Ninja Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1389
| * | | | Compiler/TI: Add support for depfile generation for NinjaNico Müller2017-10-183-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TI C/C++ compiler are now able to generate dependency files during compilation. Fixes: #17360
* | | | | Merge topic 'ide-direct-CMakeLists.txt'Brad King2017-10-1912-124/+93
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 344d149a VS,Xcode: Add CMakeLists.txt sources without mutating targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1392
| * | | | | VS,Xcode: Add CMakeLists.txt sources without mutating targetsBrad King2017-10-1812-124/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than injecting `CMakeLists.txt` files into each target's `SOURCES`, teach the generators to add them during generation using dedicated code. This avoids mutating the original targets, and avoids polluting `$<TARGET_PROPERTY:foo,SOURCES>` with generator-specific content. This also avoids listing the `CMakeLists.txt` sources in the results of `CMAKE_DEBUG_TARGET_PROPERTIES==SOURCES` so the `RunCMake.TargetSources` test no longer needs a separate case for IDEs.
* | | | | | CMake Nightly Date StampKitware Robot2017-10-191-1/+1
|/ / / / /
* | | | | Merge branch 'release-3.10'Brad King2017-10-180-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'vs-cuda-machine' into release-3.10Brad King2017-10-171-0/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1390
| * \ \ \ \ Merge branch 'findopenmp-lib-paths' into release-3.10Brad King2017-10-171-7/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1385
* | \ \ \ \ \ Merge topic 'cmake-open'Brad King2017-10-1821-29/+299
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96d642c7 cmake-gui: Use cmake::Open to open generated project 5de37a4a cmake: Add --open option for IDE generators Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ruslan Baratov <ruslan_baratov@yahoo.com> Merge-request: !1337
| * | | | | | | cmake-gui: Use cmake::Open to open generated projectGregor Jasny2017-10-134-28/+46
| | | | | | | |
| * | | | | | | cmake: Add --open option for IDE generatorsGregor Jasny2017-10-1317-1/+253
| | | | | | | |
* | | | | | | | Merge topic 'module-fetchcontent'Brad King2017-10-1823-0/+1266
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e56634f FetchContent: Add tests 60e74d2f FetchContent: New module for populating content at configure time Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1306
| * | | | | | | | FetchContent: Add testsCraig Scott2017-10-1618-0/+318
| | | | | | | | |
| * | | | | | | | FetchContent: New module for populating content at configure timeCraig Scott2017-10-165-0/+948
| | | | | | | | |
* | | | | | | | | Merge topic 'vs-cuda-machine'Brad King2017-10-181-0/+7
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd90a14f VS: Set CUDA TargetMachinePlatform explicitly on x64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1390
| * | | | | | | | VS: Set CUDA TargetMachinePlatform explicitly on x64Brad King2017-10-171-0/+7
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `TargetMachinePlatform` setting tells CUDA what `--machine {32,64}` flag to pass to nvcc. While CUDA automatically chooses the proper default for the target architecture, it does not reflect this in the user-visible IDE settings. Set it explicitly to fix the user-visible setting. Fixes: #17355
* | | | | | | | Merge topic 'findopenmp-lib-paths'Brad King2017-10-181-7/+21
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4cc7109 FindOpenMP: Improve OMP libraries search Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1385
| * | | | | | | FindOpenMP: Improve OMP libraries searchChristian Pfeiffer2017-10-171-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This supports libraries given as full path and filters libraries given in CMAKE_<LANG>_STANDARD_LIBRARIES. Fixes: #17351
* | | | | | | | CMake Nightly Date StampKitware Robot2017-10-181-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.10'Brad King2017-10-170-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'vs-2017-cl-check' into release-3.10Brad King2017-10-162-25/+40
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1388
| * \ \ \ \ \ \ \ Merge branch 'imported-interface-no-system' into release-3.10Brad King2017-10-135-15/+22
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1386
* | \ \ \ \ \ \ \ \ Merge topic 'vs-2017-cl-check'Brad King2017-10-172-25/+40
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f566586e VS: Detect compiler component in VS 2017 instances more reliably c6bb704e cmVSSetupHelper: Fix install location encoding conversion 4c3116d7 cmVSSetupHelper: Factor out install location string construction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1388
| * | | | | | | | | VS: Detect compiler component in VS 2017 instances more reliablyBrad King2017-10-162-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `Microsoft.VisualStudio.Component.VC.Tools.x86.x64` component is not the only way a VS instance may provide the `cl` compiler tool. For example, VS 2017 Express Edition does not install that component. Instead search for the tools directly on disk within an instance. Suggested-by: Rich Chiodo <rchiodo@microsoft.com> Fixes: #17349