Commit Graph

38007 Commits

Author SHA1 Message Date
Melven Roehrig-Zoellner e04f1d1b47 CodeBlocks: add option for the CB compiler ID
CodeBlocks uses his own compiler ID string which may differ from
CMAKE_<LANG>_COMPILER_ID. In particular CodeBlocks supports a large
number of different compiler configurations (with different IDs)
This commit adds a cache variable "CMAKE_CODEBLOCKS_COMPILER_ID",
so the user might adjust it when needed.
2017-11-27 14:41:54 -05:00
Kitware Robot 85ae0ba796 CMake Nightly Date Stamp 2017-11-19 00:01:05 -05:00
Kitware Robot 9c4a74559d CMake Nightly Date Stamp 2017-11-18 00:01:08 -05:00
Brad King 6e07850544 Merge topic 'blas-lapack-flame'
f5bc7826 Find{BLAS,LAPACK}: Add support for FLAME blis and libflame

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1486
2017-11-17 10:18:21 -05:00
Brad King 7dfeafaaaa Merge topic 'FindRuby-through-2.4'
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
2017-11-17 10:15:25 -05:00
Brad King d261704ef5 Merge topic 'test-bad-foreach-in-function'
fb114a40 Tests: Add test for bad foreach inside a function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1492
2017-11-17 10:14:03 -05:00
Christian Pfeiffer 8e6d6337cd Merge topic 'fomp-cmp0012'
36cc4378 FindOpenMP: Enable policy CMP0012

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1490
2017-11-17 07:20:37 -05:00
Kitware Robot 89fa46e29b CMake Nightly Date Stamp 2017-11-17 00:02:24 -05:00
J M Dieterich f5bc78263e Find{BLAS,LAPACK}: Add support for FLAME blis and libflame
FLAME (github.com/flame) provides a variety of numerical libraries.
`blis` and `libflame` can be setup to expose BLAS/LAPACK interfaces.

Fixes: #17470
2017-11-16 11:43:15 -05:00
Brad King fb114a40aa Tests: Add test for bad foreach inside a function
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
2017-11-16 11:10:05 -05:00
Brad King c1930caffe Merge branch 'release-3.10' 2017-11-16 10:53:11 -05:00
Brad King b9ef87431b Merge topic 'FindMatlab-better-host-detect'
9f1916aa FindMatlab: Avoid if() auto-dereference in 64-bit host detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1482
2017-11-16 10:52:23 -05:00
Brad King ee5867287a Merge topic 'fomp-no-def-path'
98314d53 FindOpenMP: Use NO_DEFAULT_PATH where appropriate

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1481
2017-11-16 10:51:20 -05:00
Brad King 5b34fb2021 Merge topic 'fmpi-command-not-found'
1615cded FindMPI: Treat 'command not found' as an error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1483
2017-11-16 10:50:39 -05:00
Brad King 8f9301ba25 Merge topic 'msvc-version'
3bc21a70 MSVC: Fix MSVC_VERSION when mixing MSVC C/C++ with Intel Fortran

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1488
2017-11-16 10:50:01 -05:00
Brad King e24d2b58b4 Merge topic 'test-FindPatch-windows'
501b08ea Tests: Fix FindPatch test on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1480
2017-11-16 10:49:06 -05:00
Brad King 2392f6ea3e Merge topic 'FindOpenGL-glvnd-preference'
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
2017-11-16 10:48:10 -05:00
Christian Pfeiffer 36cc43788a FindOpenMP: Enable policy CMP0012
Fixes: #17476
2017-11-16 15:22:37 +01:00
Brad King cd2cdfe253 FindRuby: Add support for versions 2.2, 2.3, and 2.4
Author: J. Peter Mugaas (jpmugaas on gitlab.kitware.com)
Fixes: #17475
2017-11-16 07:05:00 -05:00
Brad King 23ab451a13 FindRuby: Fix match of '.' in version numbers
Escape `.` so that it is matched literally and not treated as a
special match of any character by the regex.
2017-11-16 07:02:26 -05:00
Kitware Robot bd863785db CMake Nightly Date Stamp 2017-11-16 00:02:31 -05:00
Brad King 3bc21a70b5 MSVC: Fix MSVC_VERSION when mixing MSVC C/C++ with Intel Fortran
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
2017-11-15 14:58:44 -05:00
Brad King 47c2baf06a Merge branch 'FindOpenGL-glvnd-preference' into release-3.10
Merge-request: !1485
2017-11-15 13:46:05 -05:00
Brad King ff3c11eeac FindOpenGL: Add option to prefer GLVND for legacy GL
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
2017-11-15 13:44:59 -05:00
Brad King aadc38c7fd FindOpenGL: Re-order component library searches
Move the search for the legacy GL library to after the GLVND libraries.
For now we still always look for both.
2017-11-15 11:46:58 -05:00
Brad King 9f1916aaaa FindMatlab: Avoid if() auto-dereference in 64-bit host detection
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
2017-11-15 09:33:56 -05:00
Christian Pfeiffer 1615cdedf5 FindMPI: Treat 'command not found' as an error
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.
2017-11-15 15:27:35 +01:00
Christian Pfeiffer 98314d536e FindOpenMP: Use NO_DEFAULT_PATH where appropriate
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.
2017-11-15 15:05:41 +01:00
Brad King e312885829 Merge topic 'ctest-chrono'
e8a4036e CTest: use std::chrono::steady_clock for time keeping

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1445
2017-11-15 08:56:23 -05:00
Brad King 47f8998d92 Merge topic 'update-prebuilt-openssl'
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
2017-11-15 08:37:04 -05:00
Brad King 501b08ea67 Tests: Fix FindPatch test on Windows
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.
2017-11-15 06:56:04 -05:00
Kitware Robot 5c44821331 CMake Nightly Date Stamp 2017-11-15 00:04:33 -05:00
Brad King b40d45cdb1 Utilities/Release: Update to openssl-1.1.0g
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.
2017-11-14 09:43:03 -05:00
Brad King 78aeb30075 Utilities/Release: Update to openssl-1.0.2m
Update the prebuilt binary build configurations for machines where
we build our own OpenSSL library to use a newer version.
2017-11-14 09:36:07 -05:00
Wouter Klouwen e8a4036e96 CTest: use std::chrono::steady_clock for time keeping
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
2017-11-14 13:30:14 +00:00
Brad King 1fe9e49bad Merge topic 'rel-win-static'
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
2017-11-14 07:30:07 -05:00
Brad King d0606946d7 Merge branch 'release-3.10' 2017-11-14 07:29:09 -05:00
Brad King 313a565729 Utilities/Release: Build static executables on Windows
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.
2017-11-14 07:26:36 -05:00
Brad King a12830c2fd Utilities/Release: Remove unused setting in Linux build
CMake_INSTALL_DEPENDENCIES is not needed because we link both
Qt and the toolchain runtime library statically.
2017-11-14 07:26:36 -05:00
Brad King 6c23107725 Merge topic 'cmake-gui-qt-static-windows'
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
2017-11-14 07:23:40 -05:00
Brad King 8203895caa Merge topic 'xcode64'
23dd8b9e cmGlobalXCodeGenerator: Support XCTest for XCode 6.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1471
2017-11-14 07:22:42 -05:00
Brad King 269ea83eb2 Merge branch 'cmake-gui-qt-static-windows' into release-3.10
Merge-request: !1476
2017-11-14 07:19:51 -05:00
Kitware Robot 7a06f9973a CMake Nightly Date Stamp 2017-11-14 00:02:18 -05:00
Brad King 3a993c49db Tests: Add options to disable tests requiring Qt 2017-11-13 13:58:32 -05:00
Brad King b77501d4c7 Merge topic 'ctest-warning'
ec2f9012 CTest: correct misleading warning message for RUN_SERIAL tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Zack Galbreath <zack.galbreath@kitware.com>
Merge-request: !1469
2017-11-13 09:56:46 -05:00
Brad King 27a73f1613 cmake-gui: Add build option to use Qt5 windows plugin statically
This will enable builds against a static Qt5 on Windows.
2017-11-13 09:54:49 -05:00
Brad King ac38bb3aa6 Merge topic 'swig-broken-dependency-scan'
2ee10119 swig: fix incremental build in case of removed interface files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1457
2017-11-13 09:53:51 -05:00
Brad King b62eb8f697 Merge topic 'xcodeForLoopCleanup'
98cbcedd Xcode: use ranged for loops, cleanup existing for loops

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1456
2017-11-13 09:52:43 -05:00
Kitware Robot 67c981fdc2 CMake Nightly Date Stamp 2017-11-13 00:01:06 -05:00
Kitware Robot b1a06e4726 CMake Nightly Date Stamp 2017-11-12 00:01:04 -05:00