summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cpack-minor-cleanup-and-tests-extension'Brad King2017-11-2033-68/+152
|\ | | | | | | | | | | | | | | | | | | 325f34d1 CPack tests: add possibility for expecting config developer warnings 176281e1 CPack test: correctly handle CPACK_PACKAGING_INSTALL_PREFIX cf0c2599 CPack: set variable commands in lower case 2ff906b3 CPack: documentation typo fix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1499
| * CPack tests: add possibility for expecting config developer warningsDomen Vrankar2017-11-192-1/+28
| |
| * CPack test: correctly handle CPACK_PACKAGING_INSTALL_PREFIXDomen Vrankar2017-11-1930-65/+122
| | | | | | | | | | | | | | Every CPack generator sets default CPACK_PACKAGING_INSTALL_PREFIX variable value differently so test framework should support that correctly - previous version expected RPM/Deb /usr default and removed it for Archive packagers as the default there is /.
| * CPack: set variable commands in lower caseDomen Vrankar2017-11-191-1/+1
| |
| * CPack: documentation typo fixDomen Vrankar2017-11-191-1/+1
| |
* | Merge topic 'ctest-chrono'Brad King2017-11-2010-33/+44
|\ \ | | | | | | | | | | | | | | | | | | 5fd979a8 CTest: adopt std::chrono::system_clock Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1487
| * | CTest: adopt std::chrono::system_clockWouter Klouwen2017-11-1710-33/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the refactor to make CTest use std::chrono::steady_clock for the keeping of time for test duration, there are still references to cmSystemTools::GetTime() left. To further adopt std::chrono for time related activities, this commit changes those remaining references to std::chrono::system_clock::now() calls and alters the storage from either unsigned int or double to std::chrono::system_clock::time_point. For ease of conversion, a converter method is added to cmXMLWriter that converts from a std::chrono::system_clock::time_point to the number of seconds since the UN*X epoch as that is expected behaviour. This means no more casts as required. Functionally should be no difference as the system_clock is implemented in the same terms.
* | | Merge topic 'cuda-sep-comp-var'Brad King2017-11-206-0/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00e13993 CUDA: Add CMAKE_CUDA_SEPARABLE_COMPILATION variable Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alexander Korsunsky <a.korsunsky@gmail.com> Merge-request: !1495
| * | | CUDA: Add CMAKE_CUDA_SEPARABLE_COMPILATION variableBrad King2017-11-176-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use its value to initialize the `CUDA_SEPARABLE_COMPILATION` target property when targets are created. Fixes: #17478
* | | | Merge topic 'iwyu-suppress-clang-warnings'Brad King2017-11-201-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be592b23 IWYU: Suppress warnings from the internal Clang Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1496
| * | | | IWYU: Suppress warnings from the internal ClangBrad King2017-11-171-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Do not obscure IWYU's report with warnings from its internal Clang. We have other testing for such warnings. Also, when compiling with a non-Clang compiler we might use warning options that IWYU's Clang does not understand, and we don't want to see warnings about that.
* | | | Merge topic 'perf-source-lookup'Brad King2017-11-208-40/+84
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a6348db Performance: Improve efficiency of source file lookup in cmMakefile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1421
| * | | | Performance: Improve efficiency of source file lookup in cmMakefileAaron Orenstein2017-11-178-40/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reintroduces the change from commit v3.10.0-rc1~69^2 (Performance: Improve efficiency of source file lookup in cmMakefile, 2017-08-17) with some corrections. The original was rolled back by commit v3.10.0-rc1~52^2~1 (Revert "Performance: ...", 2017-09-25) due to incompatibilities found. The rollback was followed-up by addition of a test for the offending case, and this revision passes the test.
* | | | | Merge topic 'FindOpenGL-glvnd-policy'Brad King2017-11-2017-6/+135
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ea17412 FindOpenGL: Add policy CMP0072 to prefer GLVND for legacy GL Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Clinton Stimpson <clinton@elemtech.com> Merge-request: !1491
| * | | | | FindOpenGL: Add policy CMP0072 to prefer GLVND for legacy GLBrad King2017-11-1717-6/+135
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17449
* | | | | | Merge topic 'serverBugFixHasInstallRule'Brad King2017-11-201-1/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb7d0a80 server: project has install rule bug fix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1489
| * | | | | | server: project has install rule bug fixJustin Goshi2017-11-161-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to check all generators associated with the project because any of them may have an install rule.
* | | | | | | Merge topic 'vs-source-group-order'Brad King2017-11-207-21/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f26009dd VS: Order .vcxproj.filters files deterministically c871446a cmSourceGroup: Return strings from GetName and GetFullName Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1484
| * | | | | | | VS: Order .vcxproj.filters files deterministicallyBrad King2017-11-151-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort source groups by name rather than arbitrary pointer values. Fixes: #17446
| * | | | | | | cmSourceGroup: Return strings from GetName and GetFullNameBrad King2017-11-157-18/+19
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'compile_flags_xref_fix'Craig Scott2017-11-201-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87a0b54a Help: Fix cross-reference in COMPILE_FLAGS target property docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1500
| * | | | | | | Help: Fix cross-reference in COMPILE_FLAGS target property docsCraig Scott2017-11-191-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-11-201-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-11-191-1/+1
|/ / / / / /
* | | | | | CMake Nightly Date StampKitware Robot2017-11-181-1/+1
| | | | | |
* | | | | | Merge topic 'blas-lapack-flame'Brad King2017-11-173-0/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5bc7826 Find{BLAS,LAPACK}: Add support for FLAME blis and libflame Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1486
| * | | | | | Find{BLAS,LAPACK}: Add support for FLAME blis and libflameJ M Dieterich2017-11-163-0/+35
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FLAME (github.com/flame) provides a variety of numerical libraries. `blis` and `libflame` can be setup to expose BLAS/LAPACK interfaces. Fixes: #17470
* | | | | | Merge topic 'FindRuby-through-2.4'Brad King2017-11-171-3/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd2cdfe2 FindRuby: Add support for versions 2.2, 2.3, and 2.4 23ab451a FindRuby: Fix match of '.' in version numbers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1493
| * | | | | | FindRuby: Add support for versions 2.2, 2.3, and 2.4Brad King2017-11-161-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: J. Peter Mugaas (jpmugaas on gitlab.kitware.com) Fixes: #17475
| * | | | | | FindRuby: Fix match of '.' in version numbersBrad King2017-11-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escape `.` so that it is matched literally and not treated as a special match of any character by the regex.
* | | | | | | Merge topic 'test-bad-foreach-in-function'Brad King2017-11-176-0/+18
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb114a40 Tests: Add test for bad foreach inside a function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1492
| * | | | | | Tests: Add test for bad foreach inside a functionBrad King2017-11-166-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test for a case fixed by commit 6a4a61d9e1 (cmForEachCommand: prevent leakage, 2017-10-09). Prior to that fix, this test case could trigger an assertion failure. Fixes: #17464
* | | | | | | Merge topic 'fomp-cmp0012'Christian Pfeiffer2017-11-171-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36cc4378 FindOpenMP: Enable policy CMP0012 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1490
| * | | | | | | FindOpenMP: Enable policy CMP0012Christian Pfeiffer2017-11-161-0/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Fixes: #17476
* | | | | | | CMake Nightly Date StampKitware Robot2017-11-171-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'release-3.10'Brad King2017-11-160-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'FindOpenGL-glvnd-preference' into release-3.10Brad King2017-11-151-13/+57
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1485
* | \ \ \ \ \ \ Merge topic 'FindMatlab-better-host-detect'Brad King2017-11-161-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f1916aa FindMatlab: Avoid if() auto-dereference in 64-bit host detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1482
| * | | | | | | | FindMatlab: Avoid if() auto-dereference in 64-bit host detectionBrad King2017-11-151-1/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the value of `CMAKE_HOST_SYSTEM_PROCESSOR` also happens to be set as a variable by a project (e.g. `AMD64`), allowing `if()` to auto-dereference is unlikely to produce a value that matches "64". Instead let `if()` auto-dereference `CMAKE_HOST_SYSTEM_PROCESSOR`. Fixes: #17460
* | | | | | | | Merge topic 'fomp-no-def-path'Brad King2017-11-161-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98314d53 FindOpenMP: Use NO_DEFAULT_PATH where appropriate Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1481
| * | | | | | | | FindOpenMP: Use NO_DEFAULT_PATH where appropriateChristian Pfeiffer2017-11-151-0/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenMP libraries must always be found in the implicit linking directories of a compiler when using the OpenMP compile flag. If a suitable OpenMP library is also found in for example some CMAKE_PREFIX_PATH, this can lead to the module finding the incorrect library. On the other hand, CMAKE_PREFIX_PATH can't ever be a location that we need to consider since the OpenMP compile flag would not work if we needed to.
* | | | | | | | Merge topic 'fmpi-command-not-found'Brad King2017-11-161-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1615cded FindMPI: Treat 'command not found' as an error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1483
| * | | | | | | | FindMPI: Treat 'command not found' as an errorChristian Pfeiffer2017-11-151-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the compiler given in I_MPI_... could not be found, the Intel MPI wrappers emit an error like "line 590: ifort: command not found". The script should currently fail to match the output of this for information, but we should generally treat such an output as invalid, since the displayed configuration line can become a mixup between Intel and GNU compiler settings.
* | | | | | | | Merge topic 'msvc-version'Brad King2017-11-161-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3bc21a70 MSVC: Fix MSVC_VERSION when mixing MSVC C/C++ with Intel Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1488
| * | | | | | | | MSVC: Fix MSVC_VERSION when mixing MSVC C/C++ with Intel FortranBrad King2017-11-151-1/+5
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a real MSVC compiler for `C` or `CXX`, use the version of that compiler for `MSVC_VERSION`. This is preferred over the MSVC version that a non-MSVC compiler "simulates". Fixes: #17468
* | | | | | | | Merge topic 'test-FindPatch-windows'Brad King2017-11-161-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 501b08ea Tests: Fix FindPatch test on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1480
| * | | | | | | Tests: Fix FindPatch test on WindowsBrad King2017-11-151-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows our input and patch files may have CRLF newlines. Tell `patch` not to transform them to LF newlines because our baseline will have CRLF newlines too.
* | | | | | | Merge topic 'FindOpenGL-glvnd-preference'Brad King2017-11-161-13/+57
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff3c11ee FindOpenGL: Add option to prefer GLVND for legacy GL aadc38c7 FindOpenGL: Re-order component library searches Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Clinton Stimpson <clinton@elemtech.com> Merge-request: !1485
| * | | | | FindOpenGL: Add option to prefer GLVND for legacy GLBrad King2017-11-151-13/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.10.0-rc5~3^2 (FindOpenGL: Default to non-GLVND libraries for legacy GL, 2017-11-08) users may set `OPENGL_gl_LIBRARY` to empty to use GLVND components for the legacy GL interfaces. This is useful only when one knows in advance that the GLVND components will be found. Add a `OpenGL_GL_PREFERENCE` variable to specify a preference for legacy GL or GLVND. The latter can suppress `OPENGL_gl_LIBRARY` only when the needed GLVND components are found. If no preference is explicitly specified, choose a default based on whether GLVND components were requested (because this indicates the project has been updated for CMake 3.10). Issue: #17437 Issue: #17449
| * | | | | FindOpenGL: Re-order component library searchesBrad King2017-11-151-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the search for the legacy GL library to after the GLVND libraries. For now we still always look for both.