summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Autogen: Make rcc output file suffix static (instead of pseudo-random)Sebastian Holtermann2017-10-301-2/+2
|
* Merge branch 'autogen-qrc-file-name' into release-3.10Brad King2017-10-301-5/+15
|\ | | | | | | Merge-request: !1422
| * Autogen: RCC: Append checksum suffix to wrapped file nameSebastian Holtermann2017-10-291-5/+15
| | | | | | | | Closes #17404
* | Merge branch 'backport-fix-co-compile' into release-3.10Brad King2017-10-272-82/+75
|\ \ | | | | | | | | | Merge-request: !1418
| * | cmcmd: Restore support for running multiple lint toolsBrad King2017-10-271-56/+66
| | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.10.0-rc1~115^2 (Clean up iwyu code to not be one big if statement, 2017-08-28) incorrectly changed the logic to run only one lint tool at a time. Restore support for running all tools specified on the command-line.
| * | cmcmd: Convert lint handlers to file-static functionsBrad King2017-10-272-29/+12
| | | | | | | | | | | | These do not need to be declared in the header.
| * | cmcmd: Rename loop iteration variable for clarityBrad King2017-10-271-2/+2
| |/
* | Merge branch 'autogen-static-library-cycles' into release-3.10Brad King2017-10-271-17/+83
|\ \ | | | | | | | | | Merge-request: !1408
| * | Autogen: Don't add STATIC_LIBRARY cycle targets to the _autogen dependenciesSebastian Holtermann2017-10-271-17/+83
| |/ | | | | | | | | | | | | When a STATIC_LIBRARY cycle is detected we don't add any STATIC_LIBRARY target from the cycle to the `_autogen` target dependencies. Closes #17389
* | Merge branch 'cmp0040-wording' into release-3.10Brad King2017-10-261-1/+1
|\ \ | |/ |/| | | Merge-request: !1415
| * CMP0040: Clarify policy warning to match documentationBrad King2017-10-261-1/+1
| | | | | | | | | | | | | | | | | | In commit v3.5.0-rc1~8^2~2 (Help: Clarify policy `CMP0040` documentation, 2016-01-28) the documentation was clarified to indicate that the target must be defined in the current directory. Do the same for the text of the policy warning itself. Fixes: #17399
* | CMake 3.10.0-rc3v3.10.0-rc3Brad King2017-10-191-1/+1
| |
* | Merge branch 'vs-cuda-machine' into release-3.10Brad King2017-10-171-0/+7
|\ \ | | | | | | | | | 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 branch 'vs-2017-cl-check' into release-3.10Brad King2017-10-162-25/+40
|\ \ | | | | | | | | | 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.
* | Merge branch 'imported-interface-no-system' into release-3.10Brad King2017-10-132-5/+9
|\ \ | | | | | | | | | 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
* | CMake 3.10.0-rc2v3.10.0-rc2Brad King2017-10-121-1/+1
| |
* | 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
| * | 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
| | |
| * | cmGeneratorTarget: remove dead codeMatthias Maennich2017-10-051-1/+1
| | | | | | | | | | | | explicitLibraries can never be nullptr at this point
| * | cmcmd: let operator<< for NumberFormatter reset the stream's format flagsMatthias Maennich2017-10-051-1/+3
| |/
* | Merge branch 'cpack-dmg-explicit-hfs' into release-3.10v3.10.0-rc1Brad King2017-10-051-2/+2
|\ \ | | | | | | | | | Merge-request: !1354
| * | CPack: Fix PackageMaker .dmg HFS+ creation on macOS APFS hostsBrad King2017-10-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running `hdiutil create`, specify the HFS+ filesystem explicitly. Otherwise `hdiutil` may choose a filesystem based on the host. We do not want to create APFS images for `.dmg` packages because they may not mount on macOS versions prior to 10.12. This was missed in commit 39b50975d9 (CPack: Fix .dmg HFS+ creation on macOS APFS hosts, 2017-10-02). Reported-by: Alan Garny
* | | CMake 3.10.0-rc1 version updateBrad King2017-10-051-3/+3
| |/ |/|
* | CMake Nightly Date StampKitware Robot2017-10-051-1/+1
| |
* | Merge topic 'vs-no-empty-link-version'Brad King2017-10-041-2/+0
|\ \ | | | | | | | | | | | | | | | | | | 0b419b99 VS: Do not emit empty linker Version tag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1332
| * | VS: Do not emit empty linker Version tagVitaly Stakhovsky2017-10-031-2/+0
| | | | | | | | | | | | | | | This empty element does nothing, so simply remove it to simplify generated `.vcxproj` files.
* | | Merge topic 'src-flags-genex-target'Brad King2017-10-043-4/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 303cd703 VS,Xcode: Fix TARGET_PROPERTY genex in source COMPILE_FLAGS property Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Nikita Nemkin <nikita@nemkin.ru> Merge-request: !1336
| * | | VS,Xcode: Fix TARGET_PROPERTY genex in source COMPILE_FLAGS propertyBrad King2017-10-033-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | This already worked in other generators. Also add a test case. Fixes: #17314
* | | | CMake Nightly Date StampKitware Robot2017-10-041-1/+1
| |/ / |/| |
* | | CMake Nightly Date StampKitware Robot2017-10-031-1/+1
|/ /
* | Merge topic 'file-path-checksum-cpp11'Brad King2017-10-022-39/+37
|\ \ | |/ |/| | | | | | | | | 23ad08dd Migrate cmFilePathChecksum to C++11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1334
| * Migrate cmFilePathChecksum to C++11Sebastian Holtermann2017-10-012-39/+37
| |
* | CPack: Fix .dmg HFS+ creation on macOS APFS hostsBrad King2017-10-022-2/+3
| | | | | | | | | | | | | | When running `hdiutil create`, specify the HFS+ filesystem explicitly. Otherwise `hdiutil` may choose a filesystem based on the host. We do not want to create APFS images for `.dmg` packages because they may not mount on macOS versions prior to 10.12.
* | Merge topic 'DNDGen-stack-var'Brad King2017-10-021-4/+3
|\ \ | | | | | | | | | | | | | | | | | | ec30129b CPack: put local variable on the stack Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1331
| * | CPack: put local variable on the stackRolf Eike Beer2017-09-291-4/+3
| | |
* | | Merge topic 'autogen-predefs'Brad King2017-10-022-5/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6bbc1e77 Autogen: Add release notes for (CMAKE_)AUTOMOC_COMPILER_PREDEFINES 75c98b5e Autogen: Doc: Add documentation for (CMAKE_)AUTOMOC_COMPILER_PREDEFINES 1d7f099d Autogen: Add (CMAKE_)AUTOMOC_COMPILER_PREDEFINES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1328
| * | | Autogen: Add (CMAKE_)AUTOMOC_COMPILER_PREDEFINESSebastian Holtermann2017-09-292-5/+9
| |/ /
* | | Merge topic 'update-kwsys'Brad King2017-10-025-248/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90f1b9ad Merge branch 'upstream-KWSys' into update-kwsys 4532b035 KWSys 2017-09-30 (f108739d) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1333
| * | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-09-305-248/+3
| | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-09-30 (f108739d)
* | | | CMake Nightly Date StampKitware Robot2017-10-021-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2017-10-011-1/+1
|/ /
* | CMake Nightly Date StampKitware Robot2017-09-301-1/+1
|/
* Merge topic 'defer-native-tool'Brad King2017-09-291-9/+11
|\ | | | | | | | | | | | | f8cb9944 Find native build tool after determining the target system Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1317