summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Add infrastructure for generators to select a build tool instanceBrad King2017-10-195-0/+65
| | | | | | | | | | | | | | 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
* Merge topic 'curl_netrc_options'Brad King2017-10-193-0/+98
|\ | | | | | | | | | | | | | | | | | | | | 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
| * file(DOWNLOAD|UPLOAD): Add 'NETRC' and 'NETRC_FILE' suboptionShane Parris2017-10-183-0/+98
| |
* | Merge topic 'ide-direct-CMakeLists.txt'Brad King2017-10-196-71/+92
|\ \ | | | | | | | | | | | | | | | | | | 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-186-71/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 topic 'cmake-open'Brad King2017-10-1817-28/+264
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-1313-0/+218
| | |
* | | 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
* | | | CMake Nightly Date StampKitware Robot2017-10-181-1/+1
| | | |
* | | | 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
| * | | | cmVSSetupHelper: Fix install location encoding conversionBrad King2017-10-161-2/+3
| | | | |
| * | | | cmVSSetupHelper: Factor out install location string constructionBrad King2017-10-162-6/+12
| |/ / / | | | | | | | | | | | | This also adds a missing conversion to unix slashes in one code path.
* | | | CMake Nightly Date StampKitware Robot2017-10-171-1/+1
| | | |
* | | | Merge topic 'imported-interface-no-system'Brad King2017-10-162-5/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22beb07f Help: Clarify documentation of NO_SYSTEM_FROM_IMPORTED 2de0e0fd Do not initialize NO_SYSTEM_FROM_IMPORTED on INTERFACE libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1386
| * | | | Do not initialize NO_SYSTEM_FROM_IMPORTED on INTERFACE librariesBrad King2017-10-132-5/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.8.0-rc1~276^2 (Allow NO_SYSTEM_FROM_IMPORTED on imported INTERFACE libraries, 2016-11-21) was incorrect. The property is not meant to be set on imported targets at all. It is meant to be set on their consumers that compile sources. Since INTERFACE libraries have no sources to compile, the property is not needed on them. Revert most of that change. Unfortunately we must still tolerate project code setting NO_SYSTEM_FROM_IMPORTED on INTERFACE libraries because they were allowed by CMake 3.8 and 3.9. Issue: #17348
* | | | Merge topic 'cpack-wix-cygwin'Brad King2017-10-168-16/+192
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e1409101 cpack wix: support WiX generator on Cygwin e258fe03 cpack wix: fix path error on cygwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1367
| * | | | cpack wix: support WiX generator on CygwinStephen Sorley2017-10-138-16/+192
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cygwin-built CMake now converts paths from Cygwin to Windows form (using cygpath -w) before they're passed to WiX. The Wix generator on Cygwin requires the libuuid-dev package when building CMake. However, the DLL it links to is installed by default as part of Cygwin's core libs, so it does not need to be distributed. If libuuid-dev isn't available, CMake is simply built without Wix support on Cygwin.
* | | | Merge topic 'cpack-dmg-errors'Brad King2017-10-161-6/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1943dc6b cmCPackDragNDropGenerator: Improve error reporting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1379
| * | | | cmCPackDragNDropGenerator: Improve error reportingClinton Stimpson2017-10-121-6/+14
| | | | | | | | | | | | | | | | | | | | When running hdiutil and other commands, capture errors and log them.
* | | | | Merge topic 'update-kwsys'Brad King2017-10-165-27/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df92617b Merge branch 'upstream-KWSys' into update-kwsys e44b0cb2 KWSys 2017-10-12 (ef0ad34d) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1384
| * | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-10-135-27/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-10-12 (ef0ad34d)
* | | | | | CMake Nightly Date StampKitware Robot2017-10-161-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-10-151-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-10-141-1/+1
|/ / / / /
* | | | | CMake Nightly Date StampKitware Robot2017-10-131-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2017-10-121-1/+1
|/ / /
* | | Merge topic 'linked-tree'Brad King2017-10-111-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ff09abb8 cmLinkedTree: avoid unnecessary copies during Push of T Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1351
| * | | cmLinkedTree: avoid unnecessary copies during Push of TMatthias Maennich2017-10-091-3/+3
| |/ /
* | | Merge topic 'simplify-env-var-determination'Brad King2017-10-112-19/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5731f6d5 cm{Unset,Set}Command: use std::string to determine the env variable name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1350
| * | | cm{Unset,Set}Command: use std::string to determine the env variable nameMatthias Maennich2017-10-102-19/+8
| |/ /
* | | Merge topic 'autogen-skip-ui'Brad King2017-10-111-6/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e95429fd Autogen: Docs: Extend SKIP_AUTOUIC documentation 814cddbe Autogen: Docs: Add examples for AUTORCC_OPTIONS and AUTOUIC_OPTIONS 1c196268 Autogen: Allow setting SKIP_AUTOUIC/GEN on .ui files not in the sources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1366
| * | | Autogen: Allow setting SKIP_AUTOUIC/GEN on .ui files not in the sourcesSebastian Holtermann2017-10-091-6/+10
| | | | | | | | | | | | | | | | | | | | SKIP_AUTOUIC and SKIP_AUTOGEN were ignored when set on a `.ui` file that was not in the sources of the target.
| * | | Merge branch 'minor-fixes' into release-3.10Brad King2017-10-064-6/+8
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1349
| * \ \ \ Merge branch 'cpack-dmg-explicit-hfs' into release-3.10v3.10.0-rc1Brad King2017-10-051-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1354
* | \ \ \ \ Merge topic 'update-kwsys'Brad King2017-10-118-43/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f1a4ecdc Merge branch 'upstream-KWSys' into update-kwsys c551ff58 KWSys 2017-10-10 (239bc737) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1370
| * | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-10-108-43/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-10-10 (239bc737)
* | | | | | | CMake Nightly Date StampKitware Robot2017-10-111-1/+1
| | | | | | |
* | | | | | | Merge topic 'tryrun-strcpy'Brad King2017-10-101-4/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a483b7ea TryRun: do not call strcpy() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1364
| * | | | | | TryRun: do not call strcpy()Rolf Eike Beer2017-10-081-4/+5
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-10-101-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-10-091-1/+1
|/ / / / /
* | | | | CMake Nightly Date StampKitware Robot2017-10-081-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2017-10-071-1/+1
| | | | |
* | | | | Merge topic 'minor-fixes'Brad King2017-10-064-6/+8
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b32b717b cmInstallCommandArguments: do not access static members through `this` 7eaa964e cmProcessTools: fix minor issue introduced by 595feb3 85a7eaba cmGeneratorTarget: remove dead code 3345e2a2 cmcmd: let operator<< for NumberFormatter reset the stream's format flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1349
| * | | | cmInstallCommandArguments: do not access static members through `this`Matthias Maennich2017-10-051-3/+3
| | | | |
| * | | | cmProcessTools: fix minor issue introduced by 595feb3Matthias Maennich2017-10-051-1/+1
| | | | |