summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Autogen: Check if we can run the MocOsMacros testSebastian Holtermann2018-08-072-9/+25
| | | | | | | | | | The MocOsMacros test requires moc to support moc_predefs.h on some platforms (e.g. Mac). moc supports moc_predefs.h inclusion since Qt 5.8, therefore run the MocOsMacros only if Qt >= 5.8 and if CMAKE_CXX_COMPILER_PREDEFINES_COMMAND is defined. Fixes #18245
* Merge topic 'productbuild-merge-output'Craig Scott2018-08-071-2/+2
|\ | | | | | | | | | | | | 496d22b8cc productbuild: Capture stderr too in CPackProductBuild logs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2257
| * productbuild: Capture stderr too in CPackProductBuild logsMuhammad Ismail Soboute2018-08-061-2/+2
| | | | | | | | | | Stdout and stderr will be merged. Fixes: #18234
* | Merge topic 'xerces-version-fix'Brad King2018-08-071-4/+4
|\ \ | | | | | | | | | | | | | | | | | | 00a5836a3d FindXercesC: Correct order of version detection and versioned library checks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2259
| * | FindXercesC: Correct order of version detection and versioned library checksRoger Leigh2018-08-031-4/+4
| | |
* | | CMake Nightly Date StampKitware Robot2018-08-071-1/+1
| | |
* | | Merge topic 'update_maintainer_edit_label'Brad King2018-08-061-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 670324bea2 Help: Update maintainer edit checkbox label Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2263
| * | | Help: Update maintainer edit checkbox labelCraig Scott2018-08-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Recent GitLab updates have changed the label associated with the checkbox in merge request descriptions for allowing edits from maintainers. Make the contributor guidelines match the new label and add a note for why it is recommended.
* | | | Merge topic 'autogen_single_entry'Brad King2018-08-062-28/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87e7904c91 Autogen: Use a single AUTOGEN setup function in cmGlobalGenerator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2260
| * | | | Autogen: Use a single AUTOGEN setup function in cmGlobalGeneratorSebastian Holtermann2018-08-032-28/+28
| | |/ / | |/| | | | | | | | | | | | | | | | | | By moving all AUTOGEN setup code in ``cmGlobalGenerator`` into a single ``cmGlobalGenerator::QtAutoGen`` function, the ``cmGlobalGenerator::Compute`` function becomes cleaner.
* | | | Merge topic 'xcode_schemes_config'Brad King2018-08-0645-0/+738
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b7f1e1db0 Xcode: Add variables and properties to configure schemes 39c91d0703 cmGlobalGenerator: Add IsXcode query Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1803
| * | | | Xcode: Add variables and properties to configure schemesGregor Jasny2018-08-0143-0/+734
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `XCODE_SCHEME_*` target properties and associated variables `CMAKE_XCODE_SCHEME_*` to initialize them on target creation. Map each target property value to an associated Xcode scheme entry. Co-Author: Martin Sander <mail@martin-sander.de> Fixes: #17919
| * | | | cmGlobalGenerator: Add IsXcode queryBrad King2018-08-012-0/+4
| | |_|/ | |/| | | | | | | | | | Make it easy to detect use of the Xcode generator.
* | | | Merge topic 'nag-fortran-rsp'Brad King2018-08-061-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10d6c3a635 NAG: Pass response files through front-end to the linker Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2250
| * | | | NAG: Pass response files through front-end to the linkerBrad King2018-08-011-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The `nagfor` compiler front-end does not support the `@rspfile` syntax. Use `-Wl,@rspfile` instead to pass it through to the linker. Fixes: #18232
* | | | Merge topic 'xl-exe-pic'Brad King2018-08-061-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2856e0b2b XL: Use -qpic for position independent executables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2249
| * | | | XL: Use -qpic for position independent executablesBrad King2018-08-011-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | The XL compiler does not have a dedicated "pie" option so use at least `-qpic`. This missing setting was exposed by the `ExportImport` and `PositionIndependentTargets` tests with XL on an ELF platform.
* | | | Merge topic 'FindMatlab-mcc'Brad King2018-08-062-1/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f34f6eb3d1 FindMatlab: Add component to find MCC, the Matlab compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2233
| * | | | FindMatlab: Add component to find MCC, the Matlab compilerJason Heeris2018-08-012-1/+27
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Add component `MCC_COMPILER` to request searching for the Matlab compiler. Report it in `Matlab_MCC_COMPILER` if it is found. Issue: #18183
* | | | Merge topic 'FindMatlab-cross-compile'Brad King2018-08-061-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3434c22c29 FindMatlab: only search registry on windows hosts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2248
| * | | | FindMatlab: only search registry on windows hostsJulien Schueller2018-08-011-1/+1
| |/ / / | | | | | | | | From Linux, it fails when cross-compiling
* | | | Merge branch 'release-3.12'Brad King2018-08-060-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'cuda-arch-version' into release-3.12Brad King2018-08-011-2/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2251
* | \ \ \ \ Merge topic 'cuda-arch-version'Brad King2018-08-061-2/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 37ba34c0b0 FindCUDA/select_compute_arch: Restore two-component CUDA_VERSION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2251
| * | | | | FindCUDA/select_compute_arch: Restore two-component CUDA_VERSIONBrad King2018-08-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.12.0-rc1~332^2 (FindCUDA/select_compute_arch: Add support for CUDA as a language, 2018-03-15) this module sets `CUDA_VERSION` based on `CMAKE_CUDA_COMPILER_VERSION` when the language is enabled. Limit it to two components for consistency with the normal `FindCUDA` documentation and behavior. Fixes: #18231
* | | | | | Merge topic 'check-unique_ptr-pgi'Brad King2018-08-064-4/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a2c736b41 Extend C++17/C++14 feature checks to require unique_ptr Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2252
| * | | | | | Extend C++17/C++14 feature checks to require unique_ptrBrad King2018-08-014-4/+9
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When testing compiler modes higher than C++11 for constructs we need, include a check for using `unique_ptr` in that mode. The PGI 18.4 compiler in some environments supports `unique_ptr` in C++11 mode but is broken for C++14 and C++17. Check that `unique_ptr` works in these modes before using one.
* | | | | | Merge topic 'file-WRITE-chmod'Brad King2018-08-062-10/+18
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | bdd0174df1 file(WRITE): Avoid toggling permissions between 644 and 664 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2246
| * | | | | file(WRITE): Avoid toggling permissions between 644 and 664David Faure2018-08-012-10/+18
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On systems with umask 022, this function would set permissions to 664 and restore them to 644 at the end, every single time it was called (which is many times on e.g. install_manifest.txt). The intent of the code was to make non-writable files temporarily writable and to restore permissions in the end, but really, if it's already user-writable there's no point in toggling this back and forth.
* | | | | CMake Nightly Date StampKitware Robot2018-08-061-1/+1
| | | | |
* | | | | Merge topic 'contributing-reference-dashboard-client'Craig Scott2018-08-051-0/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f9b26718b7 contributing: Document that anyone can contribute testing machine Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2254
| * | | | | contributing: Document that anyone can contribute testing machineJean-Christophe Fillion-Robin2018-08-051-0/+14
| |/ / / /
* | | | | Merge topic 'help-testing-reference-script'Craig Scott2018-08-051-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79ba596909 Help: Add link to cmake_common.cmake in test process docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2256
| * | | | | Help: Add link to cmake_common.cmake in test process docsJean-Christophe Fillion-Robin2018-08-051-1/+2
| |/ / / /
* | | | | Merge topic 'readme-reference-wiki'Craig Scott2018-08-051-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91e4d3df15 readme: Add reference to the wiki Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2255
| * | | | | readme: Add reference to the wikiJean-Christophe Fillion-Robin2018-08-011-1/+3
| |/ / / /
* | | | | CMake Nightly Date StampKitware Robot2018-08-051-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-08-041-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2018-08-031-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-08-021-1/+1
|/ / /
* | | Merge branch 'release-3.12'Brad King2018-08-010-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'UseSWIG-legacy-user-flags' into release-3.12Brad King2018-07-311-3/+4
| |\ \ | | | | | | | | | | | | Merge-request: !2245
* | \ \ Merge topic 'UseSWIG-legacy-user-flags'Brad King2018-08-011-3/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 2f88c177d0 UseSWIG: restore legacy behavior for SWIG_MODULE_<name>_EXTRA_FLAGS Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Julien Schueller <schueller@phimeca.com> Merge-request: !2245
| * | | UseSWIG: restore legacy behavior for SWIG_MODULE_<name>_EXTRA_FLAGSMarc Chevrier2018-07-311-3/+4
| |/ / | | | | | | | | | Fixes: #18226
* | | Merge topic 'gcc-8-warnings'Brad King2018-08-0115-885/+913
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 276d3c7afe IWYU: Add workaround mapping for std::hash 72f57845d3 cmXMLParser: Avoid -Wconversion warning 34257b0dd4 LexerParser: Suppress GCC -Wconversion warnings cfa6b14f9c cmGlobalGenerator: Avoid -Wstringop-truncation warning 9df0e1f98a cmCommandArgumentParserHelper: Avoid -Wstringop-truncation warning b6d116e240 cmCursesLongMessageForm: Avoid -Wstringop-overflow warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2244
| * | | IWYU: Add workaround mapping for std::hashBrad King2018-07-312-0/+4
| | | | | | | | | | | | | | | | | | | | When using GCC 8's standard library IWYU thinks that `<system_error>` must be included to get `std::hash`. Add a mapping for `<utility>`.
| * | | cmXMLParser: Avoid -Wconversion warningBrad King2018-07-311-2/+2
| | | | | | | | | | | | | | | | | | | | Add an explicit cast since we expect the conversion to be well within range.
| * | | LexerParser: Suppress GCC -Wconversion warningsBrad King2018-07-319-880/+904
| | | | | | | | | | | | | | | | | | | | GCC 8 warns about some of the conversions in bison-generated code. Suppress the warnings.
| * | | cmGlobalGenerator: Avoid -Wstringop-truncation warningBrad King2018-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | Use `memcpy` instead of `strncpy` to copy bytes into a buffer that is not intended to be null terminated.
| * | | cmCommandArgumentParserHelper: Avoid -Wstringop-truncation warningBrad King2018-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | Use `memcpy` instead of `strncpy` to copy bytes from a buffer that may not be null terminated.