summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'update-kwsys'Brad King2019-01-313-10/+23
|\ | | | | | | | | | | | | | | | | 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
| * Configure KWSys to honor CMake_NO_CXX_STANDARDBrad King2019-01-301-0/+3
| | | | | | | | | | | | KWSys now computes a default `CMAKE_CXX_STANDARD` value if it is not told what standard to use. When `CMake_NO_CXX_STANDARD` is enabled, tell KWSys not to do that.
| * Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-01-302-10/+20
| |\ | | | | | | | | | | | | * upstream-KWSys: KWSys 2019-01-30 (ce89cada)
| | * KWSys 2019-01-30 (ce89cada)KWSys Upstream2019-01-302-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit ce89cada1c48be31e6294a984b15c2c75b66eab0 (master). Upstream Shortlog ----------------- Brad King (2): 5d92e8d9 Require CMake 3.1 or higher for KWSys 6db3c607 Require C++11 or higher to compile KWSys
* | | Merge topic 'variables1'Brad King2019-01-312-10/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d20fe014f Help: moved 7 variables to "internal" section dfb2d6178e Help: "internal variables" instead of "obsolete", with some explanatory prose 9c4cdc43f6 Help: declare CMAKE_HOME_DIRECTORY obsolete Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2881
| * | | Help: moved 7 variables to "internal" sectionJoachim Wuttke (o)2019-01-301-7/+7
| | | |
| * | | Help: "internal variables" instead of "obsolete", with some explanatory proseJoachim Wuttke (o)2019-01-301-1/+6
| | | |
| * | | Help: declare CMAKE_HOME_DIRECTORY obsoleteJoachim Wuttke (o)2019-01-302-3/+13
| | | |
* | | | Merge topic 'msys_docs'Brad King2019-01-312-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec027aa64a Help: Add documentation for MSYS variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2882
| * | | | Help: Add documentation for MSYS variableHarry Mallon2019-01-302-0/+5
| | | | |
* | | | | Merge topic 'lapack-docs'Brad King2019-01-312-82/+123
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be7b30f67e Find{BLAS,LAPACK}: Add note and example for using Intel MKL b323407235 Find{BLAS,LAPACK}: Update docs to use modern conventions ba30b94435 FindLAPACK: Remove extra indentation from a line Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2880
| * | | | | Find{BLAS,LAPACK}: Add note and example for using Intel MKLMichael Hirsch, Ph.D2019-01-302-0/+22
| | | | | |
| * | | | | Find{BLAS,LAPACK}: Update docs to use modern conventionsMichael Hirsch, Ph.D2019-01-302-85/+104
| | | | | |
| * | | | | FindLAPACK: Remove extra indentation from a lineMichael Hirsch, Ph.D2019-01-301-1/+1
| | | | | |
* | | | | | Merge topic 'FindLAPACK-typo'Brad King2019-01-312-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cba5b22db3 Merge branch 'backport-FindLAPACK-typo' 6f5e4a53bc FindLAPACK: Distinguish check result variable name from FindBLAS bb735025de Find{BLAS,LAPACK}: Drop unnecessary mark_as_advanced calls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2897
| * \ \ \ \ \ Merge branch 'backport-FindLAPACK-typo'Brad King2019-01-310-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the `-s ours` merge strategy to avoid conflicts. Our side was already fixed by commit 8b63265ea5 (FindLAPACK: Unify internal variables related to MKL, 2018-11-18) as part of other work.
| | * | | | | | FindLAPACK: Distinguish check result variable name from FindBLASBrad King2019-01-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 192a9182f8 (FindLAPACK: MKL clean up and fix for windows, 2013-10-08, v3.0.0-rc1~538^2), FindLAPACK accidentally used FindBLAS's `BLAS_` prefix for some of its check results. Since commit 5b8f69ebe9 (FindBLAS: Detect implicitly linked BLAS library, 2018-08-28, v3.13.0-rc1~150^2~2), FindBLAS stores a check result in a plain `BLAS_WORKS` variable. The typo in FindLAPACK happens to cause a collision with that name. The typo was already fixed in post-3.13 development as part of other work in commit 8b63265ea5 (FindLAPACK: Unify internal variables related to MKL, 2018-11-18). Fix the typo in the 3.13 version of FindLAPACK to avoid the collision. Otherwise it could cause FindLAPACK to incorrectly determine that a certain library combination does not work (or incrrectly that it works). Fixes: #18860
| * | | | | | | Find{BLAS,LAPACK}: Drop unnecessary mark_as_advanced callsBrad King2019-01-312-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache entries created by `try_compile` are already `INTERNAL`.
* | | | | | | | Merge topic 'autogen-qt-version-from-dirprops'Brad King2019-01-317-19/+97
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ Merge branch 'autogen-qt-version-from-dirprops-release' into ↵Ben Boeckel2019-01-300-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | autogen-qt-version-from-dirprops-master * autogen-qt-version-from-dirprops-release: AutoGen: query Qt5 version from directory properties Tests: add cases for providing Qt5Core_VERSION manually
| | * | | | | | | | AutoGen: query Qt5 version from directory propertiesBen Boeckel2019-01-301-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows functions which enable AutoGen to make the version variables available at generate time. See: #18732
| | * | | | | | | | Tests: add cases for providing Qt5Core_VERSION manuallyBen Boeckel2019-01-306-1/+72
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | 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.
| * | | | | | | | Tests: add cases for providing Qt5Core_VERSION manuallyBen Boeckel2019-01-306-1/+72
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge topic 'restore-install-late-framework'Brad King2019-01-314-2/+43
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ Merge branch 'backport-restore-install-late-framework'Brad King2019-01-300-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | macOS: Restore compatibility for setting FRAMEWORK after install()Brad King2019-01-293-2/+30
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Fixes: #18848
| * | | | | | | | macOS: Restore compatibility for setting FRAMEWORK after install()Brad King2019-01-304-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge topic 'readlistfile-stdstring'Brad King2019-01-314-14/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0779bc9393 ReadListFile: Accept std::string argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2889
| * | | | | | | | | 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-3058-139/+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-2958-139/+209
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'fetchcontent-reduce-boilerplate'Brad King2019-01-3013-74/+275
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a94355c7b7 FetchContent: Add new command FetchContent_MakeAvailable() 611d5274de Sphinx: Add limited support for nested variables in docs 1a07e1b47d FetchContent: Trivial doc corrections Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2830
| * | | | | | | FetchContent: Add new command FetchContent_MakeAvailable()Craig Scott2019-01-2612-68/+266
| | | | | | | | | | | | | | | | | | | | | | | | Relates: #18754
| * | | | | | | Sphinx: Add limited support for nested variables in docsCraig Scott2019-01-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to allow example code to contain content like `${some_${foo}_bar}`.
| * | | | | | | FetchContent: Trivial doc correctionsCraig Scott2019-01-201-6/+6
| | | | | | | |
* | | | | | | | 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.
* | | | | | | | | Merge topic 'vendor-docs'Brad King2019-01-301-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f201c9257d DOCS: put Flang in alphabetical order Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2879
| * | | | | | | | DOCS: put Flang in alphabetical orderMichael Hirsch, Ph.D2019-01-291-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'functional-callbacks'Brad King2019-01-3016-191/+158
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c92db829b MessageCallback: Remove unused bool& argument bcee24aecc Use `std::function` for callbacks Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: vvs31415 <vstakhovsky@fastmail.com> Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de> Merge-request: !2872
| * | | | | | | | | MessageCallback: Remove unused bool& argumentRegina Pfeifer2019-01-299-28/+23
| | | | | | | | | |
| * | | | | | | | | Use `std::function` for callbacksRegina Pfeifer2019-01-2916-187/+159
| |/ / / / / / / /
* | | | | | | | | Merge topic 'copyfile-stdstring'Brad King2019-01-3011-33/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c31b6e616d cmSystemTools: copy file member functions accept std::string params Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2877
| * | | | | | | | | cmSystemTools: copy file member functions accept std::string paramsVitaly Stakhovsky2019-01-2911-33/+18
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up `c_str()`s. `cmSystemTools::CopyFileIfDifferent()` removed as redundant.
* | | | | | | | | Merge topic 'UseJava-if-cleanup'Brad King2019-01-301-147/+147
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95ef818c7d UseJava: clean-up if() expressions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2871
generated by cgit v0.12 at 2025-09-10 12:46:56 (GMT)