summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmGlobalNinjaGenerator: run ninja tools in the build directoryBen Boeckel2020-02-031-0/+2
| | | | Fixes: #20303
* Merge topic 'ninja-multi-variable-shuffle'Brad King2020-02-0332-172/+455
|\ | | | | | | | | | | | | b966f86d86 Ninja Multi-Config: Shuffle variables around Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4305
| * Ninja Multi-Config: Shuffle variables aroundKyle Edwards2020-02-0332-172/+455
| | | | | | | | | | | | Remove redundant variable CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE. Rename other variables. Document and improve handling of error conditions.
* | Merge topic 'ctest-add-ignore-no-tests-option'Kyle Edwards2020-02-0316-1/+94
|\ \ | | | | | | | | | | | | | | | | | | a39d4139d0 Add --no-tests=<[error|ignore]> option to CTest Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4258
| * | Add --no-tests=<[error|ignore]> option to CTestStefan Dinkelacker2020-01-3116-1/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | If no tests were found, the default behavior of CTest is to always log an error message but to return an error code in script mode only. This option unifies the behavior of CTest by either returning an error code if no tests were found or by ignoring it. Signed-off-by: Stefan Dinkelacker <s.dinkelacker@dkfz-heidelberg.de>
* | | Merge topic 'bootstrap-c++-features'Brad King2020-02-031-0/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2834f3355d Bootstrap: take care of C++ features configuration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4301
| * | | Bootstrap: take care of C++ features configurationMarc Chevrier2020-02-011-0/+24
| | | |
* | | | Merge topic 'fix_automoc_deps_rule_name'Brad King2020-02-031-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c664bb5b9 Fix AUTOMOC deps file to contain correct rule name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4313
| * | | | Fix AUTOMOC deps file to contain correct rule nameAlexandru Croitor2020-01-311-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rule name should include the current binary path relative to the top level binary path. Fixes: #20298
* | | | | Merge topic 'windows-gnu-asm'Brad King2020-02-038-18/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97de48b528 Tests: Update Assembler code generation to select MSVC runtime library 6348ffb9e5 ASM: Hook up Windows-specific GNU/Clang compiler information modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4287
| * | | | | Tests: Update Assembler code generation to select MSVC runtime libraryBrad King2020-01-311-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `Assembler` test runs the C compiler in a custom command to generate a `.s` file for the platform. When using the GNU-like Clang variant on Windows, ensure that the custom command includes the MSVC runtime library selection flags for Clang. That way the resulting `.s` file, when assembled into a `.obj`, will tell the linker what runtime library it needs.
| * | | | | ASM: Hook up Windows-specific GNU/Clang compiler information modulesMartin Storsjö2020-01-317-16/+28
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This allows building .s/.S assembly code, and makes sure that the `-fPIC` option isn't passed to the compiler (as it errors out on Clang and causes a loud warning on GCC).
* | | | | Merge topic '7zip-fix'Brad King2020-02-031-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34413cbf3f cmArchiveWrite: Remove ./ suffix from 7zip archives Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4311
| * | | | | cmArchiveWrite: Remove ./ suffix from 7zip archivesCristian Adam2020-01-311-2/+3
| |/ / / / | | | | | | | | | | | | | | | Fixes: #20297
* | | | | Merge topic 'ninja_multi_config_test_understand_win_cuda'Brad King2020-02-032-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f39ea3318 NinjaMultiConfig: CUDA executables generate symbols on windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4310
| * | | | | NinjaMultiConfig: CUDA executables generate symbols on windowsRobert Maynard2020-01-312-0/+6
| | | | | |
* | | | | | Merge topic 'cpack-deprecate-old-macos-generators'Brad King2020-02-035-2/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ed00e8ef8 CPack: Deprecate OSXX11 generator 7bf187499f CPack: Deprecate PackageMaker generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4309
| * | | | | | CPack: Deprecate OSXX11 generatorBrad King2020-01-313-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CPack OSXX11 generator has not had any updates since 2011 except as part of sweeping maintenance changes. It also creates packages with a OSXScriptLauncher binary that has only ppc and i386 architectures which are not supported by Apple anymore. Furthermore, the generator is not even mentioned in our documentation. Add a deprecation warning. Fixes: #20235
| * | | | | | CPack: Deprecate PackageMaker generatorBrad King2020-01-314-1/+14
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode no longer distributes the PackageMaker tools. Add a deprecation warning when the generator is used. Issue: #20235
* | | | | | Merge topic 'blas-intel-mkl'Brad King2020-02-032-10/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 807a129f3c Find{BLAS,LAPACK}: Include parent of points directory in search fe86dc43fe Find{BLAS,LAPACK}: Fixed an incorrect use of a macro argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4306
| * | | | | | Find{BLAS,LAPACK}: Include parent of points directory in searchMario Emmenlauer2020-01-312-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required if MKLROOT points to the subdirectory .../mkl/ instead of the root of an Intel MKL library installation. Only in this case the MKL will be searched starting from the parent directory, to detect relevant dependencies in parallel subdirectories, like 'compiler' and 'tbb'.
| * | | | | | Find{BLAS,LAPACK}: Fixed an incorrect use of a macro argumentMario Emmenlauer2020-01-312-10/+12
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'aix-no-export-all'Brad King2020-02-0324-22/+126
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afcd9fe669 AIX: Add an option to disable automatic exports from shared libraries 67f30811ce AIX: Improve name of internal symbol export list file 0ffd54f094 AIX: Add ExportImportList option to skip the object files 0dcfb63cb9 AIX: Revise ExportImportList to build output more incrementally Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4308
| * | | | | | AIX: Add an option to disable automatic exports from shared librariesBrad King2020-01-3123-5/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0f150b69d3 (AIX: Explicitly compute shared object exports for both XL and GNU, 2019-07-11, v3.16.0-rc1~418^2~2) we always export all symbols from shared libraries by default. Add a new target property called `AIX_EXPORT_ALL_SYMBOLS` that can be explicitly set to OFF to suppress this behavior and export no symbols by default. Fixes: #20290
| * | | | | | AIX: Improve name of internal symbol export list fileBrad King2020-01-312-4/+4
| | | | | | |
| * | | | | | AIX: Add ExportImportList option to skip the object filesBrad King2020-01-311-14/+18
| | | | | | |
| * | | | | | AIX: Revise ExportImportList to build output more incrementallyBrad King2020-01-311-2/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | This will allow more steps to be added.
* | | | | | Merge topic 'clang-tidy-driver-mode'Brad King2020-02-032-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3aea865801 clang-tidy: Fix explicit --driver-mode= argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4307
| * | | | | | clang-tidy: Fix explicit --driver-mode= argumentBrad King2020-01-312-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f6f4eb0907 (clang-tidy: Add driver mode argument, 2020-01-19) the `clang-tidy` tool rejects the new option: Unknown command line argument '--driver-mode=g++'. This is because we are adding the flag before the main compiler command-line. Encode it with `--extra-arg-before=` so that `clang-tidy` knows it is supposed to be part of the compiler command. Suggested-by: Hanjiang Yu
* | | | | | | Merge topic 'findCUDAToolkit_correct_cudart_static_deps'Brad King2020-02-031-0/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60bb7a54d5 CUDAToolkit: Add required static runtime library dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4294
| * | | | | | | CUDAToolkit: Add required static runtime library dependenciesRobert Maynard2020-01-301-0/+25
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | CUDAToolkit now adds the correct libraries that are required by the static runtime.
* | | | | | | CMake Nightly Date StampKitware Robot2020-02-031-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-02-021-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-02-011-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'release-3.16'Brad King2020-01-310-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge topic 'aix-skip-exports' into release-3.16Brad King2020-01-311-1/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a17f6eff43 AIX: Restore pre-3.16 undocumented method to suppress exports with XL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4303
* | \ \ \ \ \ \ Merge topic 'aix-skip-exports'Brad King2020-01-311-1/+11
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a17f6eff43 AIX: Restore pre-3.16 undocumented method to suppress exports with XL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4303
| * | | | | | | AIX: Restore pre-3.16 undocumented method to suppress exports with XLBrad King2020-01-301-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 0f150b69d3 (AIX: Explicitly compute shared object exports for both XL and GNU, 2019-07-11, v3.16.0-rc1~418^2~2) we dropped use of the old `CMAKE_XL_CreateExportList` cache entry for XL exports. However, some people were setting the value to an empty string as a way to disable automatic export of symbols. Restore this behavior when the option is explicitly set to an empty string. Issue: #20290
* | | | | | | | Merge topic 'libarchive-solaris-11.4'Brad King2020-01-311-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f70b49b498 libarchive: Fix detection of 'major' on Solaris 11.4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4302
| * | | | | | | | libarchive: Fix detection of 'major' on Solaris 11.4Brad King2020-01-301-1/+5
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `archive_pack_dev.c` there is code checking the `HAVE_MAJOR` macro, but it is not computed. Port the equivalent logic from `archive_entry.c`.
* | | | | | | | Merge topic 'GNUInstallDirs-no-system'Brad King2020-01-314-10/+22
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c18ed7236d GNUInstallDirs: Warn when CMAKE_SYSTEM_NAME is not set Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4300
| * | | | | | | GNUInstallDirs: Warn when CMAKE_SYSTEM_NAME is not setVitaly Lipatov2020-01-304-10/+22
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a project writes `include(GNUInstallDirs)` before `project()` then `CMAKE_SYSTEM_NAME` may not be set and an incorrect `LIBDIR` may be computed. Warn about this case.
* | | | | | | CMake Nightly Date StampKitware Robot2020-01-311-1/+1
| | | | | | |
* | | | | | | Merge topic 'automoc-using-depfiles'Brad King2020-01-3031-28/+3657
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aebfbcaa46 AutoGen: Use depfiles for the XXX_autogen ninja targets f765fdea03 AutoGen: Use moc's feature to output dependencies f8c505d4b3 Add a parser for GCC-style depfiles Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Jan Niklas Hasse <jhasse@bixense.com> Merge-request: !4221
| * | | | | | | AutoGen: Use depfiles for the XXX_autogen ninja targetsJoerg Bornemann2020-01-284-6/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The XXX_autogen targets are implemented as utility commands, which means they always run, even if there weren't any changes. For the Ninja generator and Qt >= 5.15 we're taking a different approach: This commit adds custom commands that create XXX_autogen/timestamp files. Those custom commands have a depfile assigned that is generated from the depfiles that were created by moc. The XXX_autogen targets merely wrap the XXX_autogen/timestamp custom commands. Fixes: #18749
| * | | | | | | AutoGen: Use moc's feature to output dependenciesJoerg Bornemann2020-01-2810-21/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Qt version 5.15.0 moc learned to output the dependencies of the generated file. This commit enhances JobCompileMocT to read the dependency file written by moc. The dependencies are stored in the same cache that's used for the dependencies determined by dependency filters. The dependency filter functionality is turned off if moc's dependency output feature is used. Fixes: #17750 Fixes: #19058
| * | | | | | | Add a parser for GCC-style depfilesJoerg Bornemann2020-01-2820-1/+3390
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce the function cmReadGccDepfile that parses a GCC-style depfile and returns its content. The implementation uses a lexer that is modeled after the re2c implementation in Ninja. The sample files of the autotest have been created with gcc 8.3.0. This depfile reader is to be used by the Autogen facility to make use of the depfiles that are generated by Qt's meta object compiler.
* | | | | | | | Merge topic 'std-string-cleanup'Brad King2020-01-3025-94/+85
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbc07e4561 Source: use std::string in place of const char* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4299
| * | | | | | | | Source: use std::string in place of const char*Vitaly Stakhovsky2020-01-2925-94/+85
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge topic 'document_cmake_reserved_names'Brad King2020-01-303-0/+10
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2158ef3e44 Help: Document which variable names CMake reserves. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4298