summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Find native build tool after determining the target systemBrad King2017-09-271-9/+11
| | | | | | | | | | This will allow toolchain files and platform modules to specify information that affects the selection of the native build tool.
* | Merge topic 'simplify-generator-parameters'Brad King2017-09-293-20/+5
|\ \ | | | | | | | | | | | | | | | | | | 29849376 try_compile: Simplify generator platform and toolset propagation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1318
| * | try_compile: Simplify generator platform and toolset propagationBrad King2017-09-273-20/+5
| |/ | | | | | | | | | | | | | | We don't need to save the `CMAKE_GENERATOR_{PLATFORM,TOOLSET}` values from the cache back into the `cmake` instance. They were used only to propagate the settings into `cmake` instances for `try_compile`, but we already have their values in the `cmMakefile`'s variables anyway. In fact those variables are the ones we actually give to the generators.
* | Merge topic 'add-vs-shader-properties'Brad King2017-09-291-0/+34
|\ \ | | | | | | | | | | | | | | | | | | 49dab3eb VS: Add VS_SHADER_OUTPUT_HEADER_FILE and VS_SHADER_VARIABLE_NAME properties. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1319
| * | VS: Add VS_SHADER_OUTPUT_HEADER_FILE and VS_SHADER_VARIABLE_NAME properties.Kevin M. Godby2017-09-271-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VS_SHADER_OUTPUT_HEADER_FILE property is the name of the generated header file containing the object code of the shader. The VS_SHADER_VARIABLE_NAME property is the name of the variable containing the object code in the above header file. Signed-off-by: Kevin M. Godby <kevin@godby.org>
* | | Merge topic 'autogen-macro-names2'Brad King2017-09-292-12/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93c8d55d Autogen: Update (CMAKE_)AUTOMOC_MACRO_NAMES release notes 084ace47 Autogen: Tests: Update AUTOMOC_MACRO_NAMES test 08041dd1 Autogen: Doc: Update documentation for (CMAKE_)AUTOMOC_MACRO_NAMES 7b33d67b Autogen: Create info file directory before writing 786b5be0 Autogen: Define all macro names in CMAKE_AUTOMOC_MACRO_NAMES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1321
| * | | Autogen: Create info file directory before writingSebastian Holtermann2017-09-281-5/+10
| | | |
| * | | Autogen: Define all macro names in CMAKE_AUTOMOC_MACRO_NAMESSebastian Holtermann2017-09-271-7/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Instead of adding `Q_OBJECT` and `Q_GADGET` to the macro search list in `Source/cmQtAutoGenerators.cxx`, add them in `Modules/CMakeGenericSystem.cmake` to the default value of `CMAKE_AUTOMOC_MACRO_NAMES`. Also add `Q_NAMESPACE` to `CMAKE_AUTOMOC_MACRO_NAMES` which closes #17299.
* | | Merge topic 'autogen-cmp0071-warning'Brad King2017-09-291-28/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff6a5125 Autogen: Doc: Add examples to the SKIP_AUTO* documentations 8831818f Autogen: Doc: Update CMP0071 description b0775c75 Autogen: Offer solution for CMP0071 in warning message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1322
| * | | Autogen: Offer solution for CMP0071 in warning messageSebastian Holtermann2017-09-281-28/+37
| |/ /
* | | Merge topic 'cxx11-eq-delete'Brad King2017-09-294-27/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8018135 Use C++11 '= delete' instead of CM_EQ_DELETE 42f4e697 Drop unused CMake_HAVE_CXX_UNIQUE_PTR macro Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1326
generated by cgit v0.12 at 2025-01-11 23:08:33 (GMT)