Commit Graph

11985 Commits

Author SHA1 Message Date
Brad King 6e037a04e7 Merge topic 'FindJasper-imported-target'
6e8754c625 FindJasper: Add IMPORTED target
bdbce845cd FindJasper: Add JASPER_INCLUDE_DIRS result variable
7f8413c309 FindJasper: Modernize documentation layout
524205a7a5 FindJasper: Modernize code layout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4633
2021-10-07 09:22:11 -04:00
Brad King f175a62fcc Merge topic 'xcode-lang-defaults'
3add62462c Xcode: Fix detection of default language standard when given -std= flags
5c4424e5b7 CMakeDetermineCompilerId: Tolerate variables named for languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6598
2021-10-07 09:12:45 -04:00
Brad King 0a863c71d8 Merge topic 'corret_nvhpc_fortran_compile_deps'
1a828043b7 NVHPC: only use '-MD' for the C and CXX languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6602
2021-10-07 09:11:21 -04:00
Robert Maynard 1a828043b7 NVHPC: only use '-MD' for the C and CXX languages
CMake shouldn't use '-MD' for nvfortran to generate dependency information.

Fixes #22723
2021-10-06 16:21:29 -04:00
Hiroshi Miura 6e8754c625 FindJasper: Add IMPORTED target
Fixes: #20601
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-10-06 11:28:09 -04:00
Hiroshi Miura bdbce845cd FindJasper: Add JASPER_INCLUDE_DIRS result variable
The `JASPER_INCLUDE_DIR` cache entry is not supposed to be the public
result variable.
2021-10-06 11:20:54 -04:00
Hiroshi Miura 7f8413c309 FindJasper: Modernize documentation layout 2021-10-06 11:20:38 -04:00
Hiroshi Miura 524205a7a5 FindJasper: Modernize code layout 2021-10-06 11:20:35 -04:00
Brad King 3add62462c Xcode: Fix detection of default language standard when given -std= flags
If one uses `CFLAGS='-std=...'` or `CXXFLAGS='-std=...'` then the given
`-std=` flag(s) will always be used.  That effectively changes the
compiler default standard level and extension settings.  Fix the
Xcode generator's compiler id logic to preserve any `-std=` flag
so that the proper defaults are detected.

This problem was exposed by commit 4a0485be7f (cmStandardLevelResolver:
Avoid unnecessary flags, fix unset level logic, 2021-05-29), which
changed the logic to not pass any `-std=` flag if the standard level
and extension settings requested by the project match the default
(`stdIt <= defaultStdIt` became `stdIt < defaultStdIt`).  The new
logic assumes the detected default standard matches what will actually
happen when the project is generated.
2021-10-06 10:36:39 -04:00
Brad King 5c4424e5b7 CMakeDetermineCompilerId: Tolerate variables named for languages 2021-10-06 10:36:39 -04:00
Brad King a4fbe961f8 Merge topic 'cpack-qtifw-4.1'
5895f236ae CPack/IFW: Add support for QtIFW 4.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
Merge-request: !6592
2021-10-06 10:26:36 -04:00
Brad King ca2bc33626 Merge topic 'find-blas-lapack-sizeof-integer'
64038fd5bc Help: Add release notes for Find{BLAS,LAPACK} BLA_SIZEOF_INTEGER option
972489ae4e Find{BLAS,LAPACK}: Provide testing of BLA_SIZEOF_INTEGER
95219365ff Find{BLAS,LAPACK}: Make possible testing of ILP64 model
2cd94f3e57 Find{BLAS,LAPACK}: Specify integer type in tests
9b69307b56 Find{BLAS,LAPACK}: De-duplicate and generalize test creation logic
91fd645d46 FindLAPACK: Stop processing if LAPACK library does not have 64-bit integer API
b8a3cea51f FindBLAS: Stop processing if BLAS library does not have 64-bit integer API
d2f5c7856f FindLAPACK: Search 32/64-bit integer API via BLA_SIZEOF_INTEGER if possible
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6407
2021-10-06 10:17:46 -04:00
Craig Scott 9a88f5df3e Merge topic 'fetchcontent-CMAKE-vars-passthrough'
1851aa49be FetchContent: Pass through networking-related CMAKE_... variables
96937438b7 Help: Clean up how TLS and NETRC variables are discussed
2a82bd85b6 Help: Add documentation for CMAKE_TLS_CAINFO

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6589
2021-10-06 07:07:32 -04:00
Igor S. Gerasimov 91fd645d46 FindLAPACK: Stop processing if LAPACK library does not have 64-bit integer API 2021-10-05 23:41:36 +09:00
Igor S. Gerasimov b8a3cea51f FindBLAS: Stop processing if BLAS library does not have 64-bit integer API 2021-10-05 23:41:36 +09:00
Igor S. Gerasimov d2f5c7856f FindLAPACK: Search 32/64-bit integer API via BLA_SIZEOF_INTEGER if possible 2021-10-05 23:41:36 +09:00
Igor S. Gerasimov 50696efc64 FindBLAS: Search 32/64-bit integer API via BLA_SIZEOF_INTEGER if possible 2021-10-05 23:41:29 +09:00
Igor S. Gerasimov f8079ec8d0 FindBLAS: Update Fujitsu_SSL2 2021-10-05 23:11:00 +09:00
Erlend E. Aasland 5895f236ae CPack/IFW: Add support for QtIFW 4.1
Fixes: #22722
2021-10-05 09:18:52 -04:00
Brad King f66ad94935 Merge topic 'iar-assembly-S-extension'
589c6c8e3f IAR: added .S extension for IAR-ASM.cmake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6585
2021-10-05 09:05:53 -04:00
Craig Scott 1851aa49be FetchContent: Pass through networking-related CMAKE_... variables
CMAKE_TLS_VERIFY, CMAKE_TLS_CAINFO, CMAKE_NETRC and
CMAKE_NETRC_FILE are now passed through to the underlying
ExternalProject sub-build. Previously, they were silently ignored.

Fixes: #22144
2021-10-05 23:41:34 +11:00
Brad King c55a41c9b2 Merge topic 'default_extensions'
4a0485be7f cmStandardLevelResolver: Avoid unnecessary flags, fix unset level logic
29e2b85171 Tests: Simplify RunCMake.CompileFeatures introspection
fc3a1cbdd8 CompilerID: Compiler extensions default detection
2adfd95d79 CompilerID: Rename language_dialect to language_standard
00055d7779 Help: Document CMAKE_<LANG>_STANDARD_DEFAULT
a65bee4cfc Help: Document HIP standard/extensions properties and variables
a40ff1bb5a Help: Make language standard/extensions variable pages less wordy
3feff8379b Help: Generic language standard and extension variables documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6177
2021-10-04 12:43:24 -04:00
Brad King b6b4e46a81 Merge topic 'FortranCInterface-timestamp-check'
2a00e5072d FortranCInterface: Fix regression in timestamp check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !6581
2021-10-04 10:36:52 -04:00
Brad King d1a7e78c4f Merge topic 'FortranCInterface-timestamp-check' into release-3.21
2a00e5072d FortranCInterface: Fix regression in timestamp check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !6581
2021-10-04 10:36:51 -04:00
Brad King 1bb54fa6a7 Merge topic 'cuda-6.5'
a1f0ddcbb7 CUDA: Fix detection of implicit link information with CUDA 6.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6574
2021-10-04 10:34:40 -04:00
Craig Scott 2a82bd85b6 Help: Add documentation for CMAKE_TLS_CAINFO 2021-10-04 21:48:00 +11:00
Felipe Torrezan 589c6c8e3f IAR: added .S extension for IAR-ASM.cmake 2021-10-02 21:35:18 +02:00
Seth R Johnson 2a00e5072d FortranCInterface: Fix regression in timestamp check
Since commit d7c8030541 (FortranCInterface: Fix misuse of IS_NEWER_THAN
in timestamp check, 2021-02-21, v3.21.0-rc1~631^2~3), FortranCInterface
checks for `Output.cmake.in` in the build tree instead of the source
tree as before.  This caused it to always re-run the detection.

Fixes: #22709
2021-10-01 13:00:18 -04:00
samuel100u a1f0ddcbb7 CUDA: Fix detection of implicit link information with CUDA 6.5
Fixes: #22701
2021-09-30 09:33:17 -04:00
Raul Tambre 4a0485be7f cmStandardLevelResolver: Avoid unnecessary flags, fix unset level logic
The changes are part of CMP0128.

When the standard level is unset:
* Flags are added if extension mode doesn't match the compiler's default.
  Previously logic only worked if LANG_EXTENSIONS was ON. Fixes #22224.
* The full flag is used. Previously CMAKE_LANG_EXTENSION_COMPILE_OPTION was
  used. This was only supported for IAR.

Otherwise:
* Avoid adding flags if not necessary per the detected compiler defaults.
* Fixed check for when the requested standard is older. It now matches the
  nearby comments.

I reworded the fallback comment as its logic was a bit difficult to wrap my
head around.
2021-09-29 22:28:40 +03:00
Alexander Neumann 7fdd5128b1 FindMatlab: Fix version selection if a version is given
Fixes: #22377
2021-09-29 14:33:36 -04:00
Brad King 487b011574 Merge topic 'GetPrerequisites-objdump-exe'
403f343082 GetPrerequisites: Support CMAKE_OBJDUMP with .exe extension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6566
2021-09-29 09:52:16 -04:00
Raul Tambre fc3a1cbdd8 CompilerID: Compiler extensions default detection 2021-09-28 21:24:53 +03:00
Raul Tambre 2adfd95d79 CompilerID: Rename language_dialect to language_standard
In Linux C++ terms dialect usually refers to having GNU extensions or not.
Change the name to better reflect that this is about the standard version.
2021-09-28 21:24:53 +03:00
Wirtos_new 9b94f95bed ASM_NASM: Pass preprocessor definitions to assembler
Add the `<DEFINES>` placeholder to `CMAKE_ASM_NASM_COMPILE_OBJECT`.

Fixes: #22694
2021-09-28 10:14:50 -04:00
Daniel Schlegel 403f343082 GetPrerequisites: Support CMAKE_OBJDUMP with .exe extension
When running `fixup_bundle` in a MSYS environment it fails because
`gp_tool` resolves to `objdump.exe` and not just `objdump`.

Fixes: #22381
2021-09-28 10:11:00 -04:00
Brad King 8dc72232d9 Merge topic 'iar-lang-spec-detection'
a9073db736 IAR: update language specification detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6458
2021-09-27 13:46:03 -04:00
Brad King 2974ea7c3e Merge topic 'irsl-intel-variants'
956160bb9a IRSL: Fix search for Windows redist files with Intel Classic compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6557
2021-09-24 09:16:10 -04:00
Brad King 4e23745093 Merge topic 'mpi-cross'
0723b2c935 MPI: Add fallback detection code for MPI when cross compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6537
2021-09-24 09:15:17 -04:00
Brad King 1f8b4afbce Merge topic 'FindMatlab-r2021b'
a013404f43 FindMatlab: Add R2021b => 9.11 version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6556
2021-09-24 09:14:20 -04:00
Felipe Torrezan a9073db736 IAR: update language specification detection 2021-09-23 22:09:57 +02:00
Brad King 956160bb9a IRSL: Fix search for Windows redist files with Intel Classic compiler
The oneAPI icx/ifx compilers are under `.../windows/bin`.
The classic icl/ifort compilers are under `.../windows/bin/intel64`.
Add paths to the redist directory relative to both locations.

Fixes: #22673
2021-09-23 11:45:35 -04:00
Michael Hirsch a013404f43 FindMatlab: Add R2021b => 9.11 version
R2021b released 09/22/2021.
2021-09-23 10:41:20 -04:00
Brad King c5b91304ed Merge topic 'iar-asm-deduplication'
b1727b8a7e IAR: ASM module code deduplication

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6553
2021-09-23 10:36:27 -04:00
Felipe Torrezan b1727b8a7e IAR: ASM module code deduplication 2021-09-23 10:35:06 -04:00
Brad King 272d23579f Merge topic 'matlab_versions_natural_sort'
2f43ba5073 FindMatlab: Sort available Matlab versions using natural comparison.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6555
2021-09-23 10:32:27 -04:00
Brad King 2452067fb2 Merge topic 'iar-rl78-xlink'
8954f93543 IAR: emit fatal message for RL78 XLINK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6552
2021-09-23 10:31:25 -04:00
Brad King 54188c0e8c Merge topic 'iar-riscv-binutils'
7c3684b356 IAR: fix assembler detection for RISC-V

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6551
2021-09-23 10:30:26 -04:00
Brad King 3f46b94e0a Merge topic 'IAR-executable-suffix'
9254e7ddf2 IAR: Use same executable suffix as try_compile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6546
2021-09-23 10:29:24 -04:00
Igor S. Gerasimov 88969b5167 FindBLAS: Update FlexiBLAS 2021-09-22 15:16:22 -04:00