summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindArmadillo: Add support for non-wrapper caseRyan Birmingham2020-03-061-21/+62
| | | | | | | Armadillo is typically built as a wrapper library, which is what this find module has historically supported, but it does not have to be. If not, then instead of armadillo itself, we need to link to some combination of dependencies and not armadillo.
* Merge branch 'release-3.17'Brad King2020-03-020-0/+0
|\
| * CMake 3.17.0-rc2v3.17.0-rc2Brad King2020-03-021-1/+1
| |
* | Merge topic 'test_output'Brad King2020-03-022-13/+14
|\ \ | | | | | | | | | | | | | | | | | | 1ae9ddbb9d Tests: Output the expected value in Preprocess test for debugging Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4410
| * | Tests: Output the expected value in Preprocess test for debuggingFrancisco Facioni2020-02-282-13/+14
| | |
* | | Merge topic 'CheckTypeSize-ppc64'Brad King2020-03-021-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a09d646b7c CheckTypeSize: Fix '..._CODE' result for ppc and ppc64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4413
| * | | CheckTypeSize: Fix '..._CODE' result for ppc and ppc64Brad King2020-02-281-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for ppc64 macros before plain ppc. Consider both upper and lower case variants because some compilers have only one of them. Fixes: #20368
* | | | Merge topic 'xl-fortran-module-dir-use'Brad King2020-03-023-1/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92785ed746 Tests: Enable Fortran submodule tests on XL compilers 210b0b99a9 XL: Fix using Fortran modules from their output directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4405
| * | | | Tests: Enable Fortran submodule tests on XL compilersBrad King2020-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit b66bc6606e (Tests: Add Fortran submodule tests, 2016-09-22, v3.7.0-rc1~55^2) we try a small test program to see if the Fortran compiler supports submodules. However, a typo in the test program caused it to fail on XL with the error: 1513-083 (E) Internal or module function id was not set within the function. Fix the typo so that the check passes and enables the submodule tests with XL compilers.
| * | | | XL: Fix using Fortran modules from their output directoryBrad King2020-02-282-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The XL Fortran compiler's `-qmoddir=` flag sets the module output directory but does not add the directory to the search path for using modules. This is inconsistent with other compilers like the GNU Fortran compiler's `-J` flag that does both. In order to make these consistent, add the module output directory with a `-I` flag on the XL Fortran compiler so that it will be searched when using modules too. This fixes our `FortranModules` test's coverage of submodules on Ninja + XL. That test places module files in a subdirectory that with Ninja is not the current working directory when the compiler runs. Fixes: #20400
* | | | | Merge topic 'CheckFortranSource-def'Brad King2020-03-023-35/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bc521416f CheckFortranSource*: Avoid passing -DVAR to linker Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4406
| * | | | | CheckFortranSource*: Avoid passing -DVAR to linkerBrad King2020-02-283-35/+27
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test project is compiled with a `-DVAR` compiler flag where `VAR` is the result variable. Tell `try_compile` to add the flag through `add_definitions` instead of `CMAKE_Fortran_FLAGS` so that it is not used for linking. Otherwise some Fortran compilers (e.g. XL 15) do not like the flag when used to drive linking.
* | | | | CMake Nightly Date StampKitware Robot2020-03-021-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2020-03-011-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2020-02-291-1/+1
| | | | |
* | | | | Merge topic 'csharp-out-of-source-groups'Brad King2020-02-2812-89/+124
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | ac6b18cd90 CSharp: Add support for source groups with out-of-source builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4374
| * | | | CSharp: Add support for source groups with out-of-source buildsKinan Mahdi2020-02-2812-89/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes support for multiple sources of the same name in different directories. Add a test for both problems. Issue: #19505
* | | | | Merge topic 'modernize-memory-management'Brad King2020-02-2817-138/+126
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 557cecdc3d Modernize memory management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4402
| * | | | | Modernize memory managementMarc Chevrier2020-02-2717-138/+126
| | | | | | | | | | | | | | | | | | | | | | | | Update internals of various classes
* | | | | | Merge topic 'FortranCInterface-cross-compile'Brad King2020-02-282-8/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e2683cf6d FortranCInterface: Fix broken search for test exe when cross-compiling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4404
| * | | | | | FortranCInterface: Fix broken search for test exe when cross-compilingBrad King2020-02-272-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the `find_program` call we used to locate the test executable but that can be broken by `CMAKE_FIND_ROOT_PATH_MODE_PROGRAM`. Instead teach the test project to write a file with the location of the executable it builds. Load that file to get the exact location. Fixes: #20390
* | | | | | | Merge branch 'release-3.17'Brad King2020-02-280-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge topic 'ninja-multi-variable-shuffle-again' into release-3.17Brad King2020-02-2826-80/+159
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c794b70f19 Ninja Multi-Config: Always generate build.ninja 9590c3a400 Generator: Don't allow Ninja Multi-Config variables on other generators 7a63dafafb Ninja Multi-Config: Remove "NMC" from variable names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4403
* | \ \ \ \ \ \ Merge topic 'ninja-multi-variable-shuffle-again'Brad King2020-02-2826-80/+159
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c794b70f19 Ninja Multi-Config: Always generate build.ninja 9590c3a400 Generator: Don't allow Ninja Multi-Config variables on other generators 7a63dafafb Ninja Multi-Config: Remove "NMC" from variable names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4403
| * | | | | | | Ninja Multi-Config: Always generate build.ninjaKyle Edwards2020-02-276-26/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CMAKE_DEFAULT_BUILD_TYPE is not specified, use the first item from CMAKE_CONFIGURATION_TYPES instead.
| * | | | | | | Generator: Don't allow Ninja Multi-Config variables on other generatorsKyle Edwards2020-02-2713-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We may want to enable these variables later on with specific semantics. To avoid breaking backwards compatibility, make it an error to use them for now.
| * | | | | | | Ninja Multi-Config: Remove "NMC" from variable namesKyle Edwards2020-02-2712-60/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rename `..._DEFAULT_BUILD_FILE_CONFIG` to `..._DEFAULT_BUILD_TYPE`. These name changes make the variables meaningful for future use by other generators.
* | | | | | | | Merge branch 'release-3.17'Brad King2020-02-280-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'foreach-range-issues' into release-3.17Brad King2020-02-2823-6/+92
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 185d1aefaa foreach: Set fatal error on invalid range a33b3949e5 foreach: Fix crash when parsing invalid integer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4407
* | \ \ \ \ \ \ \ Merge topic 'foreach-range-issues'Brad King2020-02-2823-6/+92
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 185d1aefaa foreach: Set fatal error on invalid range a33b3949e5 foreach: Fix crash when parsing invalid integer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4407
| * | | | | | | | foreach: Set fatal error on invalid rangeKyle Edwards2020-02-275-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20394
| * | | | | | | | foreach: Fix crash when parsing invalid integerKyle Edwards2020-02-2720-6/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20393
* | | | | | | | | Merge branch 'release-3.17'Brad King2020-02-280-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'q_namespace_export' into release-3.17Brad King2020-02-281-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 426941c433 Autogen: Recognize the new Q_NAMESPACE_EXPORT macro in AUTOMOC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4398
* | | | | | | | | Merge topic 'q_namespace_export'Brad King2020-02-281-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 426941c433 Autogen: Recognize the new Q_NAMESPACE_EXPORT macro in AUTOMOC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4398
| * | | | | | | Autogen: Recognize the new Q_NAMESPACE_EXPORT macro in AUTOMOCRichard2020-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 5.14 introduced a new moc keyword `Q_NAMESPACE_EXPORT`. Qt-Issue: https://bugreports.qt.io/browse/QTBUG-68014
* | | | | | | | CMake Nightly Date StampKitware Robot2020-02-281-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'tutorial-have-log-and-exp'Brad King2020-02-273-8/+27
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07223c5c27 Tutorial: Update Step 5 to work on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4375
| * | | | | | | Tutorial: Update Step 5 to work on WindowsBetsy McPhail2020-02-273-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `log` and `exp` should be found on Windows systems now, as expected. Update tests to be more specific in looking for the expected outcome of the tutorial.
* | | | | | | | Merge topic 'Genex-LINK_LANGUAGE'Brad King2020-02-27182-55/+1619
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 461efa7b51 Genex: Add $<LINK_LANGUAGE:...> and $<LINK_LANG_AND_ID:...> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4244
| * | | | | | | Genex: Add $<LINK_LANGUAGE:...> and $<LINK_LANG_AND_ID:...>Marc Chevrier2020-02-26182-55/+1619
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR may help to solve issues #19757 and #18008 Fixes: #19965
* | | | | | | | Merge topic 'cmake_command-command'Brad King2020-02-2729-0/+164
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54e4f2ad45 cmake_command: Add command to INVOKE other commands by name Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4286
| * | | | | | | | cmake_command: Add command to INVOKE other commands by nameCristian Adam2020-02-2529-0/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18392
* | | | | | | | | Merge topic 'execute_process_exclusive_capture'Brad King2020-02-278-8/+63
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ec274b002 execute_process: Add ECHO_(OUTPUT|ERROR)_VARIABLE options Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev> Merge-request: !4383
| * | | | | | | | | execute_process: Add ECHO_(OUTPUT|ERROR)_VARIABLE optionsCristian Adam2020-02-248-8/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20378
* | | | | | | | | | Merge topic 'gen-tgt'Brad King2020-02-271-31/+37
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d98064f156 Help: cmake-generator-expressions(7): Target-Dependent Queries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4378
| * | | | | | | | | | Help: cmake-generator-expressions(7): Target-Dependent QueriesJoachim Wuttke (h)2020-02-251-31/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain ``tgt`` at beginning of section. Then refer to ``tgt`` without redundant reexplanations.
* | | | | | | | | | | Merge topic 'doc-cpack-ifw'Brad King2020-02-271-38/+45
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1af49def54 Help: CPackIFW generator: offline installer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4379
| * | | | | | | | | | | Help: CPackIFW generator: offline installerJoachim Wuttke (o)2020-02-201-38/+45
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bundle subsections under "Other Settings". Improve explanation of the Online installer.
* | | | | | | | | | | Merge branch 'release-3.17'Brad King2020-02-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |