summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmSourceFile_refactor'Brad King2019-02-0413-84/+112
|\ | | | | | | | | | | | | | | | | | | | | 254b7260f4 cmSourceFile: Check if a file is GENERATED first in the full path computation cd8a930d61 cmSourceFile: Refactor FindFullPath method 6d407ae439 Use cmSourceFile::GetIsGenerated 2ddf3f4467 cmSourceFile: Add IsGenerated method b9d44fc350 cmSourceFile: Additional static property strings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2908
| * cmSourceFile: Check if a file is GENERATED first in the full path computationSebastian Holtermann2019-02-021-5/+5
| | | | | | | | | | | | | | In `cmSourceFile::FindFullPath` check first if the file is GENERATED before aborting on `FindFullPathFailed`. This allows recomputation of the full path when the GENERATED property was set after the file path was computed with an error.
| * cmSourceFile: Refactor FindFullPath methodSebastian Holtermann2019-02-024-63/+74
| | | | | | | | | | Refactors the cmSourceFile::FindFullPath method to use lambdas.
| * Use cmSourceFile::GetIsGeneratedSebastian Holtermann2019-02-0110-11/+11
| |
| * cmSourceFile: Add IsGenerated methodSebastian Holtermann2019-02-012-4/+17
| | | | | | | | | | | | | | All cmSourceFiles are checked at least once whether they're `GENERATED` or not. This adds a convenience method `GetIsGenerated` that returns a private boolean cache variable `IsGenerated`. `IsGenerated` is updated every time the `GENERATED` property is written.
| * cmSourceFile: Additional static property stringsSebastian Holtermann2019-02-012-3/+7
| |
* | Merge topic 'vs-wince-deployment'Brad King2019-02-041-1/+7
|\ \ | | | | | | | | | | | | | | | | | | f5d72be57a VS: Fix deployment for WinCE projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2907
| * | VS: Fix deployment for WinCE projectsWil Stark2019-02-011-1/+7
| |/ | | | | | | Fixes: #18868
* | Merge topic 'winrtrefs'Brad King2019-02-041-2/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | cff026dbc0 VS: Fix WinRT component references 6c21722adb Tests: Fix VSWinStorePhone test with Windows 10 SDK 17763 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2906
| * | VS: Fix WinRT component referencesGilles Khouzam2019-02-011-2/+8
| |/ | | | | | | | | | | | | | | | | | | | | WinRT components need to be referenced in a similar way that managed code libraries are referenced. Validate that the library reference is a WinRT component and reference it through the project. Add test coverage for `VS_WINRT_COMPONENT`. While at it, fix the IOT reference failing on Win10 SDK 17763 which doesn't include it anymore. Fixes: #18846
* | Merge topic 'set-env-warning'Brad King2019-02-041-0/+8
|\ \ | | | | | | | | | | | | | | | | | | cb01b8c8ba set: warn of extra arguments after ENV value. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2903
| * | set: warn of extra arguments after ENV value.Taylor Holberton2019-02-011-0/+8
| | | | | | | | | | | | Fixes: #18842
* | | CMake Nightly Date StampKitware Robot2019-02-041-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2019-02-031-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2019-02-021-1/+1
| |/ |/|
* | Merge topic 'server-normalize-paths'Brad King2019-02-011-2/+11
|\ \ | | | | | | | | | | | | | | | | | | 1c6c2bae28 cmake-server: Normalize build and source directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2898
| * | cmake-server: Normalize build and source directoriesGregor Jasny2019-01-311-2/+11
| |/ | | | | | | Fixes: #18862
* | CMake Nightly Date StampKitware Robot2019-02-011-1/+1
|/
* Merge topic 'ninja-intel-depfile'Brad King2019-01-313-6/+37
|\ | | | | | | | | | | | | | | | | a624a3e1b3 Ninja: Use deps=gcc for Intel Compiler on Windows f4f3b6b9af Ninja: Detect when ninja is new enough to support a multi-line depfile 699cd03212 Ninja: Drop unnecessary deptype customization infrastructure Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2893
| * Ninja: Use deps=gcc for Intel Compiler on WindowsBrad King2019-01-301-2/+22
| | | | | | | | | | | | | | | | | | | | | | Ninja 1.9 supports the depfile format generated by this compiler. Use `deps = gcc` when the version of Ninja is new enough. Unfortunately the Intel Compiler for Windows does not properly escape spaces in paths written to a depfile so if there is a space in the path we must still fall back to `deps = msvc`. Fixes: #18855
| * Ninja: Detect when ninja is new enough to support a multi-line depfileBrad King2019-01-302-0/+15
| | | | | | | | | | | | Ninja 1.9 supports the multi-line depfile format generated by the Intel Compiler for Windows. Teach the global generator to detect when the version is new enough to support this.
| * Ninja: Drop unnecessary deptype customization infrastructureBrad King2019-01-301-4/+0
| | | | | | | | | | | | Do not pass `CMAKE_NINJA_DEPTYPE_<LANG>` in place of `deps = gcc`. If Ninja ever introduces a new dependency type we will likely need to update CMake for it anyway.
* | Merge topic 'install-strip-macos'Brad King2019-01-311-1/+13
|\ \ | | | | | | | | | | | | | | | | | | 20291e8e72 install: Fix stripping on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2892
| * | install: Fix stripping on macOSHarry Mallon2019-01-301-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | On macOS the `strip` tool requires special arguments depending on the type of binary to be stripped. Fixes: #11367 Fixes: #16499
* | | Merge topic 'xcode-object-dir'Brad King2019-01-313-15/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a7f93d000 Xcode: Fix object library builds with sanitizers enabled eff9c69740 Xcode: Place object library artifacts outside Objects-normal directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2885
| * | | Xcode: Fix object library builds with sanitizers enabledBrad King2019-01-302-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using `xcodebuild -enableAddressSanitizer YES ...` causes object files to be placed in a different directory name. Xcode provides a placeholder for this that we can use in `OTHER_LDFLAGS` to reference object files for linking the dependents of object libraries. However, CMake's features for installing and exporting object libraries depend on knowing the real path with no placeholders. For these cases, use the default object directory. Users will then have to choose between sanitizers and the installation and export features, but both will work individually. Fixes: #16289
| * | | Xcode: Place object library artifacts outside Objects-normal directoryBrad King2019-01-302-15/+18
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CONFIGURATION_BUILD_DIR` value in the Xcode project file specifies where to place the library artifact. For object libraries we've used the `Objects-normal` directory to hide away the `.a` that we otherwise cannot stop Xcode from producing. The parent of this directory is also specific to the target and does not vary with Xcode's sanitizer features, so move the artifact there. Issue: #16289
* | | Merge topic 'set-validate-cache-type'Brad King2019-01-313-3/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 198650ae73 set: warn if CACHE type is not recognized Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2874
| * | | set: warn if CACHE type is not recognizedTaylor Holberton2019-01-303-3/+23
| | | |
* | | | Merge topic 'autogen-std-bind-to-lambdas'Brad King2019-01-312-6/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6fbd438c4 Autogen: Refactor std::bind calls to lambdas Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2766
| * | | | Autogen: Refactor std::bind calls to lambdasArtur Ryt2019-01-292-6/+2
| |/ / /
* | | | Merge topic 'tidy-use-equals-default-fix'Brad King2019-01-311-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f9822ff6d clang-tidy: Silence use-equals-default warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2887
| * | | | clang-tidy: Silence use-equals-default warningRegina Pfeifer2019-01-301-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | clang-tidy 7 has an option to suppress this warning in macros which defaults to '1'. Set the option to '0' and silence the warning explicitly.
* | | | Merge topic 'std-string-callback'Brad King2019-01-315-16/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1180fc8780 OutputCallback: Accept std::string argument Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: vvs31415 <vstakhovsky@fastmail.com> Merge-request: !2891
| * | | | OutputCallback: Accept std::string argumentRegina Pfeifer2019-01-305-16/+13
| |/ / /
* | | | Merge topic 'update-kwsys'Brad King2019-01-312-10/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a37614667d Configure KWSys to honor CMake_NO_CXX_STANDARD e3b26f0004 Merge branch 'upstream-KWSys' into update-kwsys c22e373a30 KWSys 2019-01-30 (ce89cada) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2886
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-01-302-10/+20
| |/ / / | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2019-01-30 (ce89cada)
* | | | Merge topic 'autogen-qt-version-from-dirprops'Brad King2019-01-311-18/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91d98542d2 Merge branch 'autogen-qt-version-from-dirprops-release' into autogen-qt-version-from-dirprops-master 062d21c36a Autogen: Read the Qt version from directory properties as well 17ac7c4024 Tests: add cases for providing Qt5Core_VERSION manually 2df6d69014 AutoGen: query Qt5 version from directory properties b598dfb65e Tests: add cases for providing Qt5Core_VERSION manually Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2883
| * | | | Autogen: Read the Qt version from directory properties as wellSebastian Holtermann2019-01-301-18/+25
| |/ / / | | | | | | | | | | | | | | | | This lets AUTOGEN read the Qt version from directory properties as a fallback when the Qt version variables are empty or unset.
* | | | Merge topic 'restore-install-late-framework'Brad King2019-01-311-2/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f64099cf5e Merge branch 'backport-restore-install-late-framework' 95210d027a macOS: Restore compatibility for setting FRAMEWORK after install() d9dd68cb60 macOS: Restore compatibility for setting FRAMEWORK after install() Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !2878
| * | | | macOS: Restore compatibility for setting FRAMEWORK after install()Brad King2019-01-301-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `FRAMEWORK` target property affects the way the `install()` command treats the target and so should be set first. Our implementation assumed that this was always the case and led to an assertion failure. Prior to CMake 3.12 this was visible only when using an explicit `LIBRARY ... NAMELINK_ONLY` option, but commit 0212d7c762 (install: add NAMELINK_COMPONENT argument, 2018-04-18, v3.12.0-rc1~139^2~3) made it possible with a simple `LIBRARY DESTINATION`. Fully supporting out-of-order specification will require non-trivial refactoring to defer install generator creation to generate time. For now simply restore the old behavior of installing the framework to the library destination and warn about the case. Fixes: #18848
* | | | | ReadListFile: Accept std::string argumentVitaly Stakhovsky2019-01-314-14/+16
| | | | |
* | | | | Merge topic 'unused-members'Brad King2019-01-311-14/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea9a376085 Remove unused 'class cmake' members Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2895
| * | | | | Remove unused 'class cmake' membersBrad King2019-01-311-14/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The `InTryCompile` member has been unused since commit 62854e9966 (cmState: Move try_compile state from cmake class., 2015-04-11, v3.3.0-rc1~196^2~9). * The `ConvertMessageType` and `IsMessageTypeVisible` members have been unused since commit 421012a330 (cmMessenger: Extract from cmake class, 2016-01-28, v3.7.0-rc1~222^2~1). * The `InitializeProperties` member has been unused since commit de722d7d63 (Move property initialization to cmState., 2015-04-06, v3.3.0-rc1~196^2~1). Co-Author: Vitaly Stakhovsky <vvs31415@gitlab.org>
* | | | | CMake Nightly Date StampKitware Robot2019-01-311-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'tidy-use-equals-delete'Brad King2019-01-3055-127/+209
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | b05b778a2d clang-tidy: Use `= delete` Acked-by: Kitware Robot <kwrobot@kitware.com> Rejected-by: vvs31415 <vstakhovsky@fastmail.com> Merge-request: !2848
| * | | clang-tidy: Use `= delete`Regina Pfeifer2019-01-2955-127/+209
| | |/ | |/|
* | | Merge topic 'vs-msbuild-arch'Brad King2019-01-302-5/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | da402a081b VS: Use MSBuild matching toolset host architecture 147d36ce93 Find native build tool after selecting a toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2876
| * | | VS: Use MSBuild matching toolset host architectureBrad King2019-01-291-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2017 and VS 2019 provide `amd64/MSBuild.exe` variants next to their `MSBuild.exe` tools. When the 64-bit host toolchain is selected (e.g. via `host=x64`), select the 64-bit MSBuild too. Fixes: #18219
| * | | Find native build tool after selecting a toolsetBrad King2019-01-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow `CMAKE_GENERATOR_TOOLSET` to influence build tool selection. For reference, commit f8cb9944a1 (Find native build tool after determining the target system, 2017-09-26, v3.10.0-rc1~31^2) already delayed this step from where it was historically.