Commit Graph

9366 Commits

Author SHA1 Message Date
Marc Chevrier
741fb95f66 Merge topic 'FindPython-module'
30b873c05d FindPython*: Manage weak link for Python modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !3291
2019-05-10 09:02:57 -04:00
Brad King
ca0ac8f289 Merge topic 'FindBoost-fphsa'
634f6ea159 FindBoost: Add new unit tests
a22dd5d8be FindBoost: Modernize module mode with FPHSA
a315977595 FindBoost: Fix and modernize config mode with FPHSA
24342d5ef7 FindBoost: Add vars Boost_VERSION_MACRO/MAJOR/MINOR/PATCH/COUNT
26634752d0 FindBoost: Introduce new imported target Boost::headers
d6c12f374d FindBoost: Compare versions consistently against Boost_VERSION_STRING

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3243
2019-05-08 12:42:29 -04:00
Brad King
be132dc6a6 Merge topic 'findmpi-debug'
c499eccc5c FindMPI: Make tests valid C89 by returning 0
521ea77fc0 FindMPI: Correct documentaiton for library version
c672a6a4b9 FindMPI: Add error logging

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3289
2019-05-07 11:16:07 -04:00
Brad King
707c180ff0 Merge topic 'CTestCoverageCollectGCOV-updates'
41d262bd3d CTestCoverageCollectGCOV: run gcov with -x
911b97867b CTestCoverageCollectGCOV: run gcov only once

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3258
2019-05-07 11:15:18 -04:00
Brad King
50c6204d26 Merge topic 'use_intel_mkl_blas_intface_on_osX'
8527dbbf44 FindBLAS: Use Intel fortran interface on OS X even with GNU Fortran

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3286
2019-05-07 11:14:20 -04:00
Marc Chevrier
30b873c05d FindPython*: Manage weak link for Python modules
Add new target Python::Module which take care of platform requirements
for Python module development.

Fixes: #18100
2019-05-07 16:37:24 +02:00
Dennis Klein
a22dd5d8be FindBoost: Modernize module mode with FPHSA 2019-05-07 16:08:55 +02:00
Dennis Klein
a315977595 FindBoost: Fix and modernize config mode with FPHSA
Fixes: #19186
2019-05-07 16:08:55 +02:00
Dennis Klein
24342d5ef7 FindBoost: Add vars Boost_VERSION_MACRO/MAJOR/MINOR/PATCH/COUNT 2019-05-07 16:08:55 +02:00
Dennis Klein
26634752d0 FindBoost: Introduce new imported target Boost::headers 2019-05-07 16:08:55 +02:00
Dennis Klein
d6c12f374d FindBoost: Compare versions consistently against Boost_VERSION_STRING 2019-05-07 16:08:54 +02:00
Christian Pfeiffer
c499eccc5c FindMPI: Make tests valid C89 by returning 0 2019-05-06 18:42:28 +02:00
Christian Pfeiffer
521ea77fc0 FindMPI: Correct documentaiton for library version 2019-05-06 18:42:02 +02:00
Christian Pfeiffer
c672a6a4b9 FindMPI: Add error logging 2019-05-06 18:40:44 +02:00
Brad King
aae79c2d70 Merge topic 'FindPython-fix-Python_RUNTIME_LIBRARY_DIRS-variable'
34c0293532 FindPython: ensure variable Python_RUNTIME_LIBRARY_DIRS is set correctly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3287
2019-05-06 09:33:45 -04:00
Brad King
1820c7e780 Merge topic 'SWIG'
e3919bae17 UseSWIG: Manage alternate library name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3241
2019-05-06 09:19:38 -04:00
Brad King
b9ee95fe5e Merge topic 'findice-clang-cl'
541f079bd7 FindIce: Support clang-cl by checking CMAKE_CXX_SIMULATE_ID

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3284
2019-05-06 09:18:28 -04:00
Marc Chevrier
34c0293532 FindPython: ensure variable Python_RUNTIME_LIBRARY_DIRS is set correctly 2019-05-05 12:55:39 +02:00
Jakub Benda
8527dbbf44 FindBLAS: Use Intel fortran interface on OS X even with GNU Fortran
According to Intel MKL Link Line Advisor, there is no GNU Fortran
interface library provided for OS X variant of Intel MKL. Because of
this missing library, FindBLAS was failing on OS X, looking for
nonexistent library libmkl_gf_[i]lp64.

To prevent this, FindBLAS will now always use Intel Fortran interface
for MKL on OS X (libmkl_intel_[i]lp64), even with GNU Fortran.
2019-05-04 10:38:02 +01:00
Cristian Morales Vega
41d262bd3d CTestCoverageCollectGCOV: run gcov with -x
Using "-x" we avoid overwriting .gcov files from source files in
different paths which happen to have the same name. It's similar to
"-p", but it produces shorter file names, reducing the risk of reaching
the file system limit.
2019-05-03 21:28:28 +01:00
Cristian Morales Vega
911b97867b CTestCoverageCollectGCOV: run gcov only once
Running gcov once per .gcda file is not only inefficient, it also
generates wrong data since .gcov files can get overwritten and in
general gcov works with less information.

fakegcov.cmake needs to be able to handle multiple .gcda files for the
test to be meaningful.
2019-05-03 21:25:20 +01:00
Marc Chevrier
e3919bae17 UseSWIG: Manage alternate library name
Manage alternate library name by passing -interface <library_name>
for python language or -dllimport <library_name> for CSharp language
to the SWIG compiler.

Fixes: #18771
2019-05-03 18:20:17 +02:00
Brad King
cd285b7496 Merge topic 'DetermineCompilerId-versioned-llvm-for-vs'
c846dbf89e CMakeDetermineCompilerId: Support versioned LLVM for Visual Studio.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3281
2019-05-03 11:43:50 -04:00
Brad King
784dd90fd4 Merge topic 'memorize_cxx_compilers_with_full_CXX14_support'
3dbec53255 CompileFeatures: Record when compilers gained full CXX14 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3280
2019-05-03 11:30:04 -04:00
jspam
541f079bd7 FindIce: Support clang-cl by checking CMAKE_CXX_SIMULATE_ID
This applies commit d48bf97f, which does the same for FindBoost, to FindIce.
2019-05-03 01:32:14 -04:00
Robert Maynard
3dbec53255 CompileFeatures: Record when compilers gained full CXX14 support
Use the infrastructure added by commit 646fb1a646 (CompileFeatures:
memoize C++ compilers with full language level support, 2019-03-27) to
avoid using a `try_compile` to check for C++14 feature support when the
running compiler is known to have all features.
2019-05-02 10:23:25 -04:00
Brad King
ce79364581 Merge topic 'ios_fixes'
4783b842ba iOS: Only set the CMAKE_FIND_ROOT_PATH_MODE_* variables when not defined
5f5e3062cf iOS: Only look for packages in the provided CMAKE_FIND_ROOT_PATHs
94c5fa5f7a iOS: Allow setting multiple CMAKE_FIND_ROOT_PATH values
1011350694 iOS: Allow specifying CMAKE_MACOSX_BUNDLE in toolchain file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3273
2019-05-02 09:46:39 -04:00
Brad King
eef1dacf51 Merge topic 'cpackrpm.debug'
d9beea0cca CPackRPM: Hide CPACK_RPM_ROOTDIR debug if not CPACK_RPM_PACKAGE_DEBUG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3271
2019-05-02 09:44:13 -04:00
Zufu Liu
c846dbf89e CMakeDetermineCompilerId: Support versioned LLVM for Visual Studio.
Supports versioned LLVM toolsets like LLVM_v142, LLVM_v141,
LLVM_v141_xp, etc. for Visual Studio (2010 and later).

The name for versioned LLVM toolsets has "LLVM_" prefix
plus MSVC toolset name (i.e. v142, v141, v141_xp, etc.).

Fixes: #19203
2019-05-02 10:57:37 +08:00
Brad King
fb325daa55 Merge topic 'IAR_6_x_fix'
4d78bea5df IAR: Fail early in case of IAR ARM 4.XX
0b684524ac IAR: Fix building with IAR ARM 6.X

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3263
2019-05-01 12:42:29 -04:00
Brad King
13b73ff65f Merge topic 'iar-binutils'
01a4eec446 IAR: Changes required for Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3262
2019-05-01 12:41:30 -04:00
Brad King
34d67a2405 Merge topic 'memorize_cxx_compilers_with_full_CXX11_support'
8d45a2ffe0 CompileFeatures: Record when compilers gained full CXX11 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3232
2019-05-01 12:40:15 -04:00
Brad King
6dbc12df68 Merge topic 'FindPython-NumPy-fix-dependencies-management'
68c8201711 FindPython: NumPy: fix erroneous dependencies management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3274
2019-05-01 12:02:07 -04:00
Brad King
a1709057ef Merge topic 'FindBoost-fix-fiber-compiler-features'
f06bf0fa57 FindBoost: Fix compiler features for `fiber` and `context`
684338aff6 FindBoost: Record compiler features for Boost 1.67 and above

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3266
2019-05-01 12:00:54 -04:00
Brad King
463e20c5c6 Merge branch 'FindPython-NumPy-fix-dependencies-management' into release-3.14
Merge-request: !3274
2019-04-30 14:58:22 -04:00
Alex Turbov
f06bf0fa57 FindBoost: Fix compiler features for fiber and context 2019-04-30 14:26:07 -04:00
Alex Turbov
684338aff6 FindBoost: Record compiler features for Boost 1.67 and above
Remove the 1.67 upper-bound on compiler feature computation so that with
newer versions we at least get it mostly right.  Leave a comment with
notes about updating features for future versions.
2019-04-30 14:25:51 -04:00
Alexandru Croitor
4783b842ba iOS: Only set the CMAKE_FIND_ROOT_PATH_MODE_* variables when not defined
This allows overriding them in a toolchain file.
2019-04-30 19:10:08 +02:00
Alexandru Croitor
5f5e3062cf iOS: Only look for packages in the provided CMAKE_FIND_ROOT_PATHs
Both CMAKE_FIND_ROOT_PATH_MODE_INCLUDE and
CMAKE_FIND_ROOT_PATH_MODE_LIBRARY are set to "ONLY" when cross
building to iOS, but appears that CMAKE_FIND_ROOT_PATH_MODE_PACKAGE
was overlooked.

This causes packages to be searched for in the host system as well,
which is incorrect and can lead to linking issues.

Set CMAKE_FIND_ROOT_PATH_MODE_PACKAGE to "ONLY" as well.

CMAKE_FIND_ROOT_PATH_MODE_PROGRAM is not touched, because a user
might want to find programs / tools on the host system.
2019-04-30 18:55:28 +02:00
Brad King
60515b205e Merge topic 'findmpi-msvc-nolibdir'
7db32efbab FindMPI: Don't retain libdirs for Win32

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3253
2019-04-30 10:08:22 -04:00
Marc Chevrier
68c8201711 FindPython: NumPy: fix erroneous dependencies management 2019-04-30 16:02:18 +02:00
Brad King
71371e3d93 Merge topic 'msvc-c-features'
eca275f63d CompileFeatures: Fix hard-coded MSVC C features

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3247
2019-04-30 09:59:57 -04:00
Alexandru Croitor
94c5fa5f7a iOS: Allow setting multiple CMAKE_FIND_ROOT_PATH values
Currently the value is hardcoded to contain only the sysroot for
the respective darwin platform. This means that it can not be changed
in a custom toolchain file.

Instead of overriding the value, simply append it. This is similar
to how it is done in the Google provided Android toolchain file.

The usecase is to allow specifying addiitonal roots to look for
3rd party packages which are definitely not present in the default
sysroot.
2019-04-30 13:40:31 +02:00
Alexandru Croitor
1011350694 iOS: Allow specifying CMAKE_MACOSX_BUNDLE in toolchain file
Currently CMAKE_MACOSX_BUNDLE is always set to true when compiling
for iOS. This poses a problem when using the source file
variant of try_compile. Even if a custom value is passed via
the CMAKE_FLAGS option, it would still be overridden by the
Darwin.cmake file.

Only set the value in case no other value was provided before.
2019-04-30 13:40:31 +02:00
Harry Mallon
d9beea0cca CPackRPM: Hide CPACK_RPM_ROOTDIR debug if not CPACK_RPM_PACKAGE_DEBUG 2019-04-30 10:52:53 +01:00
Robert Maynard
8d45a2ffe0 CompileFeatures: Record when compilers gained full CXX11 support
Use the infrastructure added by commit 646fb1a646 (CompileFeatures:
memoize C++ compilers with full language level support, 2019-03-27) to
avoid using a `try_compile` to check for C++11 feature support when the
running compiler is known to have all features.
2019-04-29 17:18:45 -04:00
Daniel Schürmann
4d78bea5df IAR: Fail early in case of IAR ARM 4.XX
This version is not yet supported because it uses xlink unsetad of ilink.
2019-04-26 10:15:01 +02:00
R. Andrew Ohana
a893018c47 Project: Report intel's simulation of gcc. 2019-04-25 13:37:44 -07:00
Daniel Schürmann
0b684524ac IAR: Fix building with IAR ARM 6.X
Use the correct version macros and version numbers.
2019-04-25 15:25:16 +02:00
Stefan Andersson
01a4eec446 IAR: Changes required for Linux 2019-04-25 11:28:58 +02:00