summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unnecessary c_str() callsVitaly Stakhovsky2018-09-0524-43/+40
| | | | Use the new IsOn(),IsOff() overloads.
* Merge topic 'cpack_test'Brad King2018-09-042-1/+20
|\ | | | | | | | | | | | | 7a7e94d6f7 CPack (DEB/RPM): add test for per-component description/summmary. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2333
| * CPack (DEB/RPM): add test for per-component description/summmary.David Faure2018-08-302-1/+20
| |
* | Merge topic 'cmakeServerSourcesForInterfaceLibraries'Brad King2018-09-043-40/+191
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | d74c2282ea cmake-server: Support codemodel filegroups for INTERFACE_SOURCES Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Tobias Hunger <tobias.hunger@gmail.com> Acked-by: Markus Enzenberger <markus.enzenberger@gmail.com> Merge-request: !2282
| * | cmake-server: Support codemodel filegroups for INTERFACE_SOURCESJustin Goshi2018-08-303-40/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change returns information for INTERFACE_SOURCES. We add a flag to the filegroup to indicate if the target represents interface sources. Protocol version is updated to 1.3 since this is a change to what was released in cmake version 3.12.
* | | Merge topic 'improve-isonoff'Brad King2018-09-042-35/+68
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bfe6991ff cmSystemTools: Re-implement IsOn,IsOff with manual branching 1fa0f2bd03 cmSystemTools: Add IsOn(),IsOff() overloads accepting std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: vvs31415 <vstakhovsky@fastmail.com> Merge-request: !2336
| * | | cmSystemTools: Re-implement IsOn,IsOff with manual branchingBrad King2018-08-311-35/+56
| | | | | | | | | | | | | | | | | | | | | | | | Replace use of std::string allocation, std::set lookups, and toupper conversions with explicit manual logic to do case-insensitive recognition of a specific set of strings.
| * | | cmSystemTools: Add IsOn(),IsOff() overloads accepting std::stringVitaly Stakhovsky2018-08-312-0/+12
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-09-041-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-09-031-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-09-021-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-09-011-1/+1
| | | |
* | | | Merge topic 'FindBLAS-implicit-blas-final'Brad King2018-08-311-498/+526
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8cdff15ef7 FindBLAS: Make Intel MKL the most preferred explicit BLAS library again 608de88f29 FindBLAS: Make Intel MKL code block respect prior found BLAS libraries 5b8f69ebe9 FindBLAS: Detect implicitly linked BLAS library 2c807b75f3 FindBLAS: Re-indent module source code to use normal conventions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2312
| * | | | FindBLAS: Make Intel MKL the most preferred explicit BLAS library againHubertus van Dam2018-08-301-180/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By adding the "if (NOT BLAS_LIBRARIES)" statement to the Intel MKL detection code block we have unintentionally turned Intel MKL from the most preferred into the least preferred BLAS library. To fix this issue the Intel MKL detection code block needs to be moved forward to make it the first explicit BLAS library we test for. This is change does just that and re-instates Intel MKL as the most preferred explicit BLAS library.
| * | | | FindBLAS: Make Intel MKL code block respect prior found BLAS librariesHubertus van Dam2018-08-301-155/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All non-Intel BLAS library detection blocks have an if-statement "if (NOT BLAS_LIBRARIES)" to ensure that if a BLAS library was found we are not going to try and find another one. This causes a problem when we have already found that we do not need to specify a BLAS library, as the Intel MKL library takes precedence over everything. Introducing the "if (NOT BLAS_LIBRARIES)" if-statement fixes this problem.
| * | | | FindBLAS: Detect implicitly linked BLAS libraryHubertus van Dam2018-08-301-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the Check_Fortran_Libraries macro with an *empty* list of libraries to detect whether the compiler implicitly links BLAS. If this works, set `BLAS_LIBRARIES` to a placeholder value to get through the rest of our logic. At the end replace the placeholder by a real empty string again to report to callers.
| * | | | FindBLAS: Re-indent module source code to use normal conventionsKitware Robot2018-08-301-476/+476
| | | | |
* | | | | Merge topic 'vs-winrt-default'Brad King2018-08-313-2/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e78a0c8e8a VS: Add option to tell generator that platfrom is WinRT by default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2315
| * | | | | VS: Add option to tell generator that platfrom is WinRT by defaultMikhail Korolev2018-08-303-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a ``CMAKE_VS_WINRT_BY_DEFAULT`` variable to indicate this. Fixes: #18286
* | | | | | Merge topic 'gg-stdstring'Brad King2018-08-313-16/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e94f6447a cmGlobalGenerator::AddInstallComponent(): Accept std::string argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2332
| * | | | | | cmGlobalGenerator::AddInstallComponent(): Accept std::string argumentVitaly Stakhovsky2018-08-303-16/+16
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'release-3.12'Brad King2018-08-310-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'CheckIPOSupported-output-backslashes' into release-3.12Brad King2018-08-301-4/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2331
* | \ \ \ \ \ \ Merge topic 'CheckIPOSupported-output-backslashes'Brad King2018-08-311-4/+11
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e1ea02bb8 CheckIPOSupported: Tolerate backslashes in output of failed checks b7dbb25a0a CheckIPOSupported: Simplify result reporting logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2331
| * | | | | | | CheckIPOSupported: Tolerate backslashes in output of failed checksBrad King2018-08-301-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid passing the output of our `try_compile` through a macro argument. Macro invocations re-parse their arguments and so should not be given arbitrary content that may contain backslashes and such. Instead pass a simple message. This is also more readable in the case that the macro generates a message itself. After the macro returns, report the real output directly to the variable named by our caller. Also record the output in a log file as other checks do on failure. Fixes: #18244
| * | | | | | | CheckIPOSupported: Simplify result reporting logicBrad King2018-08-301-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the test for whether a `RESULT` argument was given to the `check_ipo_supported` call. Also do not set an empty variable name if `OUTPUT` was not given.
* | | | | | | | Merge topic 'file-alt-httpauth'Brad King2018-08-311-0/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31301b46a7 file: Allow DOWNLOAD/UPLOAD using alternate authentication methods Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2320
| * | | | | | | | file: Allow DOWNLOAD/UPLOAD using alternate authentication methodsClinton Stimpson2018-08-301-0/+8
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge topic 'no-sanitizer-logfile'Brad King2018-08-3111-12/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5aaaee5e9e ctest_memcheck: Change failure to find log file from error to warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2323
| * | | | | | | | ctest_memcheck: Change failure to find log file from error to warningBetsy McPhail2018-08-2811-12/+2
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sanitizers do not create a log file when no defects are found. Therefore, it is currently impossible for ctest_memcheck to set both `CAPTURE_CMAKE_ERROR` and `RETURN_VALUE` to zero. With defects, `CAPTURE_CMAKE_ERROR`=0 and `RETURN_VALUE`=-1, as expected. With no defects, `CAPTURE_CMAKE_ERROR`=-1 and `RETURN_VALUE`=0.
* | | | | | | | Merge topic 'ctest-WARNING-not-error'Brad King2018-08-311-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fde61d3ad3 CTest: Add error exception for sphinx-build WARNING messages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2325
| * | | | | | | | CTest: Add error exception for sphinx-build WARNING messagesTim2018-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sphinx-build warnings look like this: ../path/to/file.rst:105: WARNING: This is not an error. CTest detects these as errors by this regex: ([^ :]+):([0-9]+): ([^ \\t]) Add an exception as we already have for lower-case `: warning`.
* | | | | | | | | Merge topic 'solaris-silence-system-libform-warning'Brad King2018-08-311-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce3cd1a89b Solaris: Silence warning when using system libform. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2330
| * | | | | | | | | Solaris: Silence warning when using system libform.Chuck Atkins2018-08-291-0/+1
| |/ / / / / / / /
* | | | | | | | | Merge topic 'capture_camke_error-update-docs'Craig Scott2018-08-313-4/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5fc11b34e4 Help: Add CAPTURE_CMAKE_ERROR to ctest_submit and ctest_update documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2324
| * | | | | | | | | Help: Add CAPTURE_CMAKE_ERROR to ctest_submit and ctest_update documentationBetsy McPhail2018-08-293-4/+16
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, added CAPTURE_CMAKE_ERROR to vim synax file for ctest_submit, ctest_update and ctest_memcheck.
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-08-311-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge topic 'minor-cleanup'Brad King2018-08-302-15/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb73edf70c cmake: Drop unnecessary working mode checks bd7dd6d414 cmake: Declare VariableWatch member only when used Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2326
| * | | | | | | | cmake: Drop unnecessary working mode checksBrad King2018-08-291-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `cmake::Run` we return before `Configure` or `Generate` when not working in normal mode so they do not need mode checks. While at it, remove a long-outdated comment about when to save the cache.
| * | | | | | | | cmake: Declare VariableWatch member only when usedBrad King2018-08-291-2/+6
| |/ / / / / / /
* | | | | | | | Merge topic 'cpack-ext-stage-and-run'Brad King2018-08-309-33/+127
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a0f664aaf CPackExt: Add CPACK_EXT_ENABLE_STAGING and CPACK_EXT_PACKAGE_SCRIPT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2272
| * | | | | | | | CPackExt: Add CPACK_EXT_ENABLE_STAGING and CPACK_EXT_PACKAGE_SCRIPTNils Gladitz2018-08-149-33/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPACK_EXT_ENABLE_STAGING enables optional staging and CPACK_EXT_PACKAGE_SCRIPT allows to specify an optional script file that can package staged files via an external packaging tool. Issue: #18236
* | | | | | | | | Merge topic 'FindPackageModeMakefileTest-use-explicit-linkage'Brad King2018-08-302-0/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 03f22cd188 FindPackageModeMakefileTest: Explicitly use C linkage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2328
| * | | | | | | | | FindPackageModeMakefileTest: Explicitly use C linkageChuck Atkins2018-08-292-0/+10
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This explicitly uses C linkage for the library code used by the test to work around some compilers (Solaris Studio 12.4) that implicitly assume incorrect linkage information. Since something else entirely is being tested here, this allows the test to proceed as needed on the affected platforms.
* | | | | | | | | Merge topic 'libarchive-bump-minimum-version'Brad King2018-08-301-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da1dc4e450 libarchive: Bump the minimum version from 3.0.0 to 3.1.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2327
| * | | | | | | | | libarchive: Bump the minimum version from 3.0.0 to 3.1.0Chuck Atkins2018-08-291-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmArchiveWrite uses the gzip:timestamp write filter option which was not available until v3.1.0.
* | | | | | | | | Merge topic 'cmake_lang_compiler_predefines'Brad King2018-08-303-3/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83f2d48388 Respect CMAKE_<LANG>_COMPILER_ARG1 in CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2316
| * | | | | | | | | Respect CMAKE_<LANG>_COMPILER_ARG1 in CMAKE_<LANG>_COMPILER_PREDEFINES_COMMANDSebastian Holtermann2018-08-283-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AUTOMOC used to fail to generate ``moc_predefs.h`` when ``ccache`` was used as a compiler starter by e.g. configuring a project with the environment variable CXX="ccache g++". The reason was that ``CMAKE_<LANG>_COMPILER_ARG1`` wasn't respected in the definition of ``CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND`` for various compilers. This is fixed by this patch. Fixes #17275.
* | | | | | | | | | Merge topic 'cstr-remove'Brad King2018-08-301-8/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95084a313d cmVisualStudio10TargetGenerator: clean up c_str()s Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2322
| * | | | | | | | | | cmVisualStudio10TargetGenerator: clean up c_str()sVitaly Stakhovsky2018-08-281-8/+8
| | |_|_|/ / / / / / | |/| | | | | | | |