summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'export-properties'Brad King2018-03-194-0/+59
|\ | | | | | | | | | | | | 6db61f0725 Export: allow exporting of additional properties Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1834
| * Export: allow exporting of additional propertiesWouter Klouwen2018-03-164-0/+59
| | | | | | | | | | | | | | | | | | This change introduces an additional property that may be set on a target to allow additional properties to be exported. Normally only a limited number of properties are exported. Additional properties may be exported by simply setting the `EXPORT_PROPERTIES` property on a target that is exported.
* | Merge topic 'codelite-project-settings'Brad King2018-03-191-4/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | 334c8ba7a4 CodeLite: Prefer CMAKE_RUNTIME_OUTPUT_DIRECTORY for output path acd322ebe4 CodeLite: Use project Makefile instead of workspace Makefile. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1840
| * | CodeLite: Prefer CMAKE_RUNTIME_OUTPUT_DIRECTORY for output pathTobias R. Henle2018-03-141-3/+6
| | | | | | | | | | | | Use the deprecated `EXECUTABLE_OUTPUT_PATH` as a fallback.
| * | CodeLite: Use project Makefile instead of workspace Makefile.Tobias R. Henle2018-03-141-1/+1
| | | | | | | | | | | | | | | Use the selected project Makefile instead of the global workspace Makefile during build of a project.
* | | Merge topic 'vs-debugger-command'Brad King2018-03-191-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5a7113d8fb VS: Add target property VS_DEBUGGER_COMMAND Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1842
| * | | VS: Add target property VS_DEBUGGER_COMMANDHannes Mezger2018-03-141-0/+7
| | | | | | | | | | | | | | | | Fixes: #17819
* | | | Merge topic 'vs10-cmelem'Brad King2018-03-192-72/+83
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a74d5a5c8b cmVisualStudio10TargetGenerator: improved XML nesting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1849
| * | | | cmVisualStudio10TargetGenerator: improved XML nestingVitaly Stakhovsky2018-03-162-72/+83
| | | | | | | | | | | | | | | | | | | | | | | | | Introduce an `Elem` helper class to track XML element state. This simplifies code in a few places, particularly OutputSourceSpecificFlags.
* | | | | CMake Nightly Date StampKitware Robot2018-03-191-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-03-181-1/+1
| | | | |
* | | | | Merge topic 'project-homepage-url'Craig Scott2018-03-171-3/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73f9b2974c project: Add HOMEPAGE_URL named parameter fd28c382b4 project: Add <PROJECT-NAME>_DESCRIPTION 9b57cb62ea Help: Fix minor typo in docs for CMAKE_PROJECT_DESCRIPTION c89993d529 Tests: Avoid enabling languages unnecessarily in RunCMake.project Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1816
| * | | | | project: Add HOMEPAGE_URL named parameterAlex Turbov2018-03-161-3/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sets variables like PROJECT_HOMEPAGE_URL, which can be used as default values for various things (packaging modules, doxygen defaults, etc.). Some packaging modules have been updated to do this as part of this commit. Co-Author: Craig Scott <craig.scott@crascit.com>
| * | | | | project: Add <PROJECT-NAME>_DESCRIPTIONCraig Scott2018-03-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | For consistency with the VERSION keyword, also define the <PROJECT-NAME>_DESCRIPTION variable.
* | | | | | CMake Nightly Date StampKitware Robot2018-03-171-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-03-161-1/+1
| | | | | |
* | | | | | Merge topic 'compile-options-shell'Brad King2018-03-151-5/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce0b983216 target_compile_options: Add syntax to specify shell strings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1841
| * | | | | target_compile_options: Add syntax to specify shell stringsBrad King2018-03-141-5/+17
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Options specified via `COMPILE_OPTIONS` and `INTERFACE_COMPILE_OPTIONS` are deduplicated, but individual options can legitimately be duplicated when grouped with other options, e.g. -D A -D B After deduplication that becomes `-D A B`. Therefore we need a way to treat groups of options as units during deduplication. A simple approach is to specify each group as one option, e.g. "-D A" "-D B" However, that conflicts with options that legitimately have spaces. To break this ambiguity, add a `SHELL:` prefix syntax to specify that an option should be parsed like shell command line arguments after deduplication, e.g. "SHELL:-D A" "SHELL:-D B" These will survive deduplication intact, and then be parsed to produce `-D A -D B` on the final command line. Fixes: #15826
* | | | | CMake Nightly Date StampKitware Robot2018-03-151-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-03-141-1/+1
| |/ / / |/| | |
* | | | Merge topic 'genex-COMPILE_LANGUAGE-system-include'Brad King2018-03-138-24/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b5e52fd65 Genex: Fix COMPILE_LANGUAGE propagation through try_compile 2deb9b7f34 Genex: Fix COMPILE_LANGUAGE in SYSTEM include directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1844
| * | | | Genex: Fix COMPILE_LANGUAGE propagation through try_compileBrad King2018-03-123-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When evaluating include directories during export to a `try_compile` test project, thread the compile language through to the generator expression evaluator so it can support `$<COMPILE_LANGUAGE:...>`. Issue: #17811
| * | | | Genex: Fix COMPILE_LANGUAGE in SYSTEM include directoriesBrad King2018-03-125-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When evaluating `INTERFACE_SYSTEM_INCLUDE_DIRECTORIES`, or evaluating `INTERFACE_INCLUDE_DIRECTORIES` on an imported target, thread the compile language through to the generator expression evaluator so that it can support `$<COMPILE_LANGUAGE:...>`. Fixes: #17811
| * | | | CMake 3.11.0-rc3v3.11.0-rc3Brad King2018-03-091-1/+1
| | | | |
| * | | | Merge branch 'update-kwsys' into release-3.11Brad King2018-03-074-16/+25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1830
* | \ \ \ \ Merge topic 'ccmake-stack-smashing'Brad King2018-03-131-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7899e53691 ccmake: fix status line buffer overflow on very wide terminals Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1836
| * | | | | ccmake: fix status line buffer overflow on very wide terminalsTianhao Chai2018-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A mistyped length calculation will memset across stack frame when the user's terminal width is larger than 270.
| * | | | | CMake 3.10.2v3.10.2Brad King2018-01-181-1/+1
| | | | | |
| * | | | | Merge branch 'backport-autogen-nexist-source-fix' into release-3.10Brad King2018-01-101-5/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1650
| | * | | | | Autogen: Ignore not existing source files in cmMakefileSebastian Holtermann2018-01-101-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until CMake 3.10 a list of source files that had the AUTOUIC_OPTIONS property populated was kept in `cmMakefile::QtUiFilesWithOptions`. In the process to remove all AUTOUIC related code from `cmMakefile` for CMake 3.10, the pre filtered list was replaced by a loop in `cmQtAutoGeneratorInitializer` over all source files in the `cmMakefile`. This loop introduced the problem that file paths were computed for source files that weren't in the target's sources and that might not even have existed. If the path for an unused and not existing file was computed a `cmake::FATAL_ERROR` with the error message "Cannot find source file:" was thrown nevertheless. This caused some projects to fail in CMake 3.10. This patch adds a test for path errors in the loops in `cmQtAutoGeneratorInitializer` that iterate over all source files in a `cmMakefile`. If a path error appears, the file is silently ignored. If the file is part of the target's sources, the path error will still be caught in the loop over all the target's sources. This is the fix for CMake 3.10.1.
| * | | | | | Merge branch 'backport-autogen-nested-lists-fix' into release-3.10Brad King2017-12-202-1/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1606
| | * | | | | | Autogen: Fix for problematic nested list separatorSebastian Holtermann2017-12-202-1/+4
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the AutogenInfo.cmake file the separator for nested lists was `@LSEP@` which led to a speed regression because the `@` character triggered an (unsuccessful) expression evaluation. By setting the policy version of the CMake instance in the `_autogen` target to 3.9, the OLD `@` evaluating behavior controlled by policy CMP0053 is disabled. Also the nested lists separator string is changed to `<<<S>>>`, which solves the problem twofold. Issue: #17570
* | | | | | | CMake Nightly Date StampKitware Robot2018-03-131-1/+1
| | | | | | |
* | | | | | | Merge topic 'genex-TARGET_EXISTS'Brad King2018-03-121-0/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7fec336bf7 genex: Add TARGET_EXISTS to check for target existence Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1829
| * | | | | | | genex: Add TARGET_EXISTS to check for target existenceAlex Turbov2018-03-091-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define `$<TARGET_EXISTS:a>` to `1` if `a` is an existed target name, else `0`.
* | | | | | | | Merge topic 'xml-raii'Brad King2018-03-122-115/+130
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90086767dd cmGlobalVisualStudio10Generator: Use cmXMLWriter RAII helpers 8401b6ac4e cmXMLWriter: Add RAII helpers to allow DOM-like syntax Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1818
| * | | | | | | | cmGlobalVisualStudio10Generator: Use cmXMLWriter RAII helpersVitaly Stakhovsky2018-03-092-117/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies our XML generation code and avoids the need to disable clang-format.
| * | | | | | | | cmXMLWriter: Add RAII helpers to allow DOM-like syntaxVitaly Stakhovsky2018-03-091-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use RAII for cmXMLWriter::StartElement/EndElement to make nesting automatic.
* | | | | | | | | Merge topic 'update-dllplatform'Brad King2018-03-123-6/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2dc2a3eb15 Identify DLL platforms via CMAKE_IMPORT_LIBRARY_SUFFIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1832
| * | | | | | | | | Identify DLL platforms via CMAKE_IMPORT_LIBRARY_SUFFIXStephan Szabo2018-03-093-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `CMAKE_IMPORT_LIBRARY_SUFFIX` to identify platforms that have DLL import libraries rather than memorizing a list of platform names. Fixes: #16801
* | | | | | | | | | Merge topic 'cmake-rc-version-decimal'Brad King2018-03-121-1/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 588a1afe76 CMakeVersion.rc: Avoid leading zeros in integer version components Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1835
| * | | | | | | | | CMakeVersion.rc: Avoid leading zeros in integer version componentsBrad King2018-03-091-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The split in commit v3.11.0-rc1~232^2 (CMakeVersion RC file: Split patch into 2 components, 2017-12-01) can leave components "2018,0309", but the latter is an octal constant with digit "9" out of range. Strip the leading zero to express the components as "2018,309" so the resource compiler treats them as decimal.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-121-1/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-111-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-101-1/+1
|/ / / / / / / /
* | | | | | | | Merge topic 'cmWorkingDirectory_success_checking'Brad King2018-03-0917-31/+226
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5901699672 cmDepends: Remove attempt to change directory that always fails e60e4dfc88 cmWorkingDirectory: Check success of current dir changes e654622aee Tests: Add --build-and-test test case a865f0beb2 Tests: Confirm test working dir set successfully Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1817
| * | | | | | | | cmDepends: Remove attempt to change directory that always failsCraig Scott2018-03-082-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nothing ever set `CompileDirectory` except `SetDirectory()`, but nothing ever called that function. Therefore, `CompileDirectory` was always empty for the attempt to change directory in `Check()`, which therefore would always fail. Nothing was checking the result and the code was always going to have no effect.
| * | | | | | | | cmWorkingDirectory: Check success of current dir changesCraig Scott2018-03-0815-19/+225
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'cmoutpconv-static'Brad King2018-03-091-6/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff5823f512 cmOutputConverter: mark helper functions static Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1827
| * | | | | | | | cmOutputConverter: mark helper functions staticRolf Eike Beer2018-03-061-6/+4
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | This allows the linker to entirely drop any symbols of the functions.