summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | | CMake Nightly Date StampKitware Robot2017-11-161-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'ctest-chrono'Brad King2017-11-1515-96/+155
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8a4036e CTest: use std::chrono::steady_clock for time keeping Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1445
| * | | | | CTest: use std::chrono::steady_clock for time keepingWouter Klouwen2017-11-1415-96/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was reported in issue #17345 that CTest does not use monotonic time to report test duration. Monotonic clocks are not affected by large NTP adjustments or things like daylight savings time. As CMake 3.10 requires C++11, which introduced std::chrono, this commit moves the time keeping in CTest from cmSystemTools::GetTime() to std::chrono::steady_clock. Fixes: #17345
* | | | | | Merge topic 'update-prebuilt-openssl'Brad King2017-11-151-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b40d45cd Utilities/Release: Update to openssl-1.1.0g 78aeb300 Utilities/Release: Update to openssl-1.0.2m Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1478
| * | | | | | Utilities/Release: Update to openssl-1.1.0gBrad King2017-11-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version. Now that we require pthreads for libuv anyway, we can use OpenSSL 1.1 along with its dependency on pthreads.
| * | | | | | Utilities/Release: Update to openssl-1.0.2mBrad King2017-11-141-3/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version.
* | | | | | CMake Nightly Date StampKitware Robot2017-11-151-1/+1
|/ / / / /
* | | | | Merge topic 'rel-win-static'Brad King2017-11-143-14/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 313a5657 Utilities/Release: Build static executables on Windows a12830c2 Utilities/Release: Remove unused setting in Linux build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1477
| * | | | | Utilities/Release: Build static executables on WindowsBrad King2017-11-142-13/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to the MSVC static runtime library (and static UCRT). Link Qt statically, including the Windows platform plugin. Disable the Qt tests because they are incompatible with a Qt using a static runtime library.
| * | | | | Utilities/Release: Remove unused setting in Linux buildBrad King2017-11-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake_INSTALL_DEPENDENCIES is not needed because we link both Qt and the toolchain runtime library statically.
* | | | | | Merge branch 'release-3.10'Brad King2017-11-140-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge branch 'cmake-gui-qt-static-windows' into release-3.10Brad King2017-11-143-5/+23
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | Merge-request: !1476
* | | | | Merge topic 'cmake-gui-qt-static-windows'Brad King2017-11-143-5/+23
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a993c49 Tests: Add options to disable tests requiring Qt 27a73f16 cmake-gui: Add build option to use Qt5 windows plugin statically Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1476
generated by cgit v0.12 at 2025-01-08 18:57:05 (GMT)