summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Precompile headers: Add methods to generate PCH sourcesCristian Adam2019-08-286-0/+40
| | | | Co-Author: Daniel Pfeifer <daniel@pfeifer-mail.de>
* Merge topic 'FindLibLZMA-windows-debug'Brad King2019-08-261-6/+39
|\ | | | | | | | | | | | | 232f5bd644 FindLibLZMA: Find debug/release variants on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3714
| * FindLibLZMA: Find debug/release variants on WindowsBraden McDaniel2019-08-231-6/+39
| |
* | Merge topic 'cpack-stgz-license-prompt'Brad King2019-08-261-9/+13
|\ \ | | | | | | | | | | | | | | | | | | 4c8741eb86 CPack/STGZ: Require explicit acceptance or refusal of license Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3717
| * | CPack/STGZ: Require explicit acceptance or refusal of licensesidju2019-08-231-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | To make using the generated STGZ easier, require a specific answer to accepting the license terms. Since more moves down one line when '\n' is entered a user may hold enter to paginate through the document. This change prevents the user from accidentally refusing the license terms by holding enter for too long and having to start over.
* | | Merge topic 'solaris-ldd'Brad King2019-08-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3bb7453436 GetPrerequisites: match ldd output on Solaris Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3695
| * | | GetPrerequisites: match ldd output on SolarisJon Chronopoulos2019-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solaris output is the following: ``` $ ldd /lib/libxml2.so libz.so.1 => /lib/libz.so.1 libm.so.2 => /lib/libm.so.2 libc.so.1 => /lib/libc.so.1 ``` While on Linux ``` $ ldd /usr/lib/libxml2.so linux-vdso.so.1 (0x00007ffe02bbe000) libdl.so.2 => /usr/lib/libdl.so.2 (0x00007f03ab852000) libicuuc.so.64 => /usr/lib/libicuuc.so.64 (0x00007f03ab67a000) libz.so.1 => /usr/lib/libz.so.1 (0x00007f03ab463000) liblzma.so.5 => /usr/lib/liblzma.so.5 (0x00007f03ab23d000) libm.so.6 => /usr/lib/libm.so.6 (0x00007f03ab0f7000) libc.so.6 => /usr/lib/libc.so.6 (0x00007f03aaf34000) /usr/lib64/ld-linux-x86-64.so.2 (0x00007f03ab9fd000) libicudata.so.64 => /usr/lib/libicudata.so.64 (0x00007f03a94ee000) libpthread.so.0 => /usr/lib/libpthread.so.0 (0x00007f03a94cd000) libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0x00007f03a92e5000) libgcc_s.so.1 => /usr/lib/libgcc_s.so.1 (0x00007f03a92cb000) ```
* | | | Merge topic 'CrayPrgEnv-update-link-type-detection'Brad King2019-08-231-3/+17
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 971c778213 CrayPrgEnv: Change default linking mode based on PE version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3716
| * | | CrayPrgEnv: Change default linking mode based on PE versionChuck Atkins2019-08-221-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Beginning with the 19.06 release of the Cray Programming Environment, the default linking mode on XC Cray systems is dynamic instead of static. This updates the CrayPrgEnv compiler wrappers to detect the PE version being used and behave accordingly.
* | | | Merge topic 'FindBoost-clarify-header-only'Brad King2019-08-221-1/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 0148f1a867 FindBoost: Add note about header-only libs in warning msg Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3712
| * | | FindBoost: Add note about header-only libs in warning msgDennis Klein2019-08-201-1/+2
| | | |
* | | | Merge topic 'FindBZip2-windows-lib-names'Brad King2019-08-211-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5edceff308 FindBZip2: Add Windows library names emitted from bzip2 1.0.6 makefile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3711
| * | | | FindBZip2: Add Windows library names emitted from bzip2 1.0.6 makefileBraden McDaniel2019-08-211-2/+2
| |/ / / | | | | | | | | | | | | | | | | As of release 1.0.6, the bzip2 distribution includs a makefile for nmake on Windows that emits library names of the form `libbz2.lib`.
* | | | Merge topic 'ProcessorCount-solaris'Brad King2019-08-211-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c87bc60ee ProcessorCount: Fix virtual processor count on Solaris Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3694
| * | | | ProcessorCount: Fix virtual processor count on SolarisJon Chronopoulos2019-08-201-3/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code did not count the number of virtual processors across physical processors on SunOS. Can handle the following situations: ``` $ uname -a SunOS solaris 5.11 11.4.0.15.0 i86pc i386 i86pc $ psrinfo -p -v The physical processor has 1 virtual processor (0) x86 (GenuineIntel 306D2 family 6 model 61 step 2 clock 3492 MHz) Intel Core Processor (Broadwell) The physical processor has 1 virtual processor (1) x86 (GenuineIntel 306D2 family 6 model 61 step 2 clock 3492 MHz) Intel Core Processor (Broadwell) The physical processor has 1 virtual processor (2) x86 (GenuineIntel 306D2 family 6 model 61 step 2 clock 3492 MHz) Intel Core Processor (Broadwell) The physical processor has 1 virtual processor (3) x86 (GenuineIntel 306D2 family 6 model 61 step 2 clock 3492 MHz) Intel Core Processor (Broadwell) ``` ``` $ uname -a SunOS sol11x86 5.11 11.0 i86pc i386 i86pc $ psrinfo -p -v The physical processor has 2 virtual processors (0 1) x86 (GenuineIntel 50650 family 6 model 85 step 0 clock 2000 MHz) Intel(r) Xeon(r) Gold 6138 CPU @ 2.00GHz ``` ``` $ uname -a SunOS sol11 5.11 11.0 sun4v sparc sun4v $ psrinfo -p -v The physical processor has 2 cores and 16 virtual processors (0-15) The core has 8 virtual processors (0-7) The core has 8 virtual processors (8-15) SPARC-T4 (chipid 0, clock 2848 MHz) ```
* | | | Merge topic 'FindCUDA-nvcc-include-dir-backslash'Brad King2019-08-211-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76b76a7f9b FindCUDA: Fix support for backslashes in CUDA_NVCC_INCLUDE_DIRS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3679
| * | | | FindCUDA: Fix support for backslashes in CUDA_NVCC_INCLUDE_DIRSHong Xu2019-08-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backslashes in `CUDA_NVCC_INCLUDE_DIRS` cause syntax errors because it is written to a generated `.cmake` script as a string literal. Use a bracket argument to hold the expanded value as we already do for `CUDA_NVCC_COMPILE_DEFINITIONS`. Then explicitly convert backslashes to forward slashes.
* | | | | Merge topic 'FindMPI-restore-flag-vars'Brad King2019-08-211-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 31b8b28fed FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS and MPI_<LANG>_COMPILE_OPTIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3710
| * | | | FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS and MPI_<LANG>_COMPILE_OPTIONSRobert Maynard2019-08-211-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit e374b9f1eb (FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS as a command-line string, 2018-09-10, v3.12.3~6^2) we tried to restore the compile flags but accidentally inverted the arguments to `list(JOIN)` causing both `MPI_<LANG>_COMPILE_FLAGS` and `MPI_<LANG>_COMPILE_OPTIONS` to be empty. Issue: #18349
* | | | Merge topic 'find_openacc_targets'Brad King2019-08-201-3/+29
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | f4fc0667ae FindOpenACC: Provide import targets and OpenACC_<lang>_OPTIONS variable 9460501ad7 FindOpenACC: Provide a Fortran snippet that compiles with gfortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3670
| * | | FindOpenACC: Provide import targets and OpenACC_<lang>_OPTIONS variableRobert Maynard2019-08-191-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | Previously the FindOpenACC module had issues where the contents of OpenACC_<lang>_FLAGS could not be used with target_compile_options when it contained multiple compiler flags.
| * | | FindOpenACC: Provide a Fortran snippet that compiles with gfortranRobert Maynard2019-08-091-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original Fortran snippet would fail to compile with the error message of: ``` return 0; 1 Error: Alternate RETURN statement at (1) is only allowed within a SUBROUTINE ``` We solve this by removing the early termination logic.
* | | | Merge topic 'swift-mode-flags'Brad King2019-08-191-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d83e47c05 Swift: define `CMAKE_Swift_FLAGS` correctly Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !3684
| * | | | Swift: define `CMAKE_Swift_FLAGS` correctlySaleem Abdulrasool2019-08-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Invoke `cmake_initialize_per_config_variable` to ensure that build type flags are properly initialised.
* | | | | Merge topic 'solaris_clang'Brad King2019-08-192-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47937219ee Solaris: Add support for Clang compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3672
| * | | | | Solaris: Add support for Clang compilerLibor Bukata2019-08-092-0/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Inspired-by: Rainer Orth Fixes: #19456
* | | | | Merge topic 'msvc-runtime-library-flang'Brad King2019-08-191-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea0294c281 Flang: Implement MSVC runtime library abstraction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3674
| * | | | | Flang: Implement MSVC runtime library abstractionBrad King2019-08-091-0/+5
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit fb3370b6a1 (MSVC: Add abstraction for runtime library selection, 2019-04-10, v3.15.0-rc1~229^2) we overlooked updating flags for Flang on Windows. Add them now and update the MSVCRuntimeLibrary Fortran test to work with Flang. Base the flags on those we already use for the GNU-like Clang targeting the MSVC ABI. Fixes: #19583
| * | | | Merge branch 'FindGLEW-macOS' into release-3.15Brad King2019-08-061-3/+34
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3656
* | \ \ \ \ Merge topic 'swift-import-library-location'Kyle Edwards2019-08-191-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5480f65ab1 Swift: honour `IMPLIB_LOCATION` property Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !3686
| * | | | | | Swift: honour `IMPLIB_LOCATION` propertySaleem Abdulrasool2019-08-121-2/+6
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rules did not account for the import library location (through `<TARGET_IMPLB>`) and instead would always write the import library to the default location (next to the shared library/executable). This prevented the use of `CMAKE_RUNTIME_OUTPUT_LOCATION` and `CMAKE_ARCHIVE_OUTPUT_LOCATION`.
* | | | | | Merge topic 'clang-llvm-rc'Kyle Edwards2019-08-161-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cea253a38b Clang: Fall back to llvm-rc when rc is unavailable Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !3687
| * | | | | | Clang: Fall back to llvm-rc when rc is unavailableGregory Mitrano2019-08-141-0/+15
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change modifies how CMAKE_RC_COMPILER is configured to improve the out-of-box experience for developers using Clang on Windows. The previous behavior was to require the user to explicitly specify the resource compiler when CMake was called. The new behavior is to automatically attempt to locate the MSVC rc binary and use that if it's found. If rc is not available, CMake will now fall back to Clang's llvm-rc binary. With this change in place, trivial C/C++ programs can be generated with Ninja and Clang on Windows without running into errors about a missing resource compiler. Fixes: #19318
* | | | | | Merge topic 'per-language-link-library-flag'Kyle Edwards2019-08-131-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 689be6235e Generator: support per-language link library flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3668
| * | | | | | Generator: support per-language link library flagSaleem Abdulrasool2019-08-091-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the use of MSVC and Swift on Windows in a single project. MSVC uses no flag to indicate linked libraries while Swift uses `-l`. Add support for a language specific link library flag which takes precedence over the global `CMAKE_LINK_LIBRARY_FLAG` which preserves compatibility with earlier releases.
* | | | | | Merge topic 'cuda_separable_compilation_determined_by_compiler_id'Kyle Edwards2019-08-132-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | a233e4e7d9 CUDA: Compilers can now state they don't require a device linking step Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3659
| * | | | | CUDA: Compilers can now state they don't require a device linking stepRobert Maynard2019-08-062-1/+3
| | | | | |
* | | | | | Merge topic 'soname-darwin'Brad King2019-08-091-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2171f6ec0e Swift: correct SONAME flag for Darwin targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3640
| * | | | | | Swift: correct SONAME flag for Darwin targetsSaleem Abdulrasool2019-08-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust the build rules for Swift to fix the SONAME handling for Darwin.
* | | | | | | Merge topic 'fphsa-components-space'Brad King2019-08-091-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e45187d525 FPHSA: Remove extra space in module components report Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !3655
| * | | | | | FPHSA: Remove extra space in module components reportSylvain Joubert2019-08-061-2/+2
| |/ / / / /
* | | | | | Merge topic 'FindPython-virtual-env'Brad King2019-08-074-185/+312
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ed84b1e8f FindPython: ensure virtual environments are correctly handled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3649
| * | | | | | FindPython: ensure virtual environments are correctly handledMarc Chevrier2019-08-054-185/+312
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Fixes: #19525
* | | | | | Merge topic 'FindGLEW-macOS'Brad King2019-08-071-3/+34
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feeb0381bc FindGLEW: Fix typo in verbose log message ab822a9b48 FindGLEW: Add required OpenGL dependency in macOS a8a3efa3be FindGLEW: Fix macOS library suffix selection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3656
| * | | | | FindGLEW: Fix typo in verbose log messageClaudio Fantacci2019-08-061-1/+1
| | | | | |
| * | | | | FindGLEW: Add required OpenGL dependency in macOSClaudio Fantacci2019-08-061-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | macOS requires OpenGL as INTERFACE_LINK_LIBRARIES dependency in the GLEW targets. This commit fixes this issue.
| * | | | | FindGLEW: Fix macOS library suffix selectionClaudio Fantacci2019-08-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic added by commit a7d853868b (FindGLEW: Update implementation, 2019-03-13, v3.15.0-rc1~375^2~1) on macOS. macOS is recognized as both UNIX and APPLE. Consequently, the library suffix for shared and static library was set, respectively, as `.so` and `.a`, just like UNIX systems. Fix this by properly checking the OS type. Fixes: #19542
* | | | | | Merge topic 'cmake-dependent-option-doc'Brad King2019-08-061-2/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | d192caefff CMakeDependentOption: Document that 4th parameter follows if-syntax Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3643
| * | | | | CMakeDependentOption: Document that 4th parameter follows if-syntaxHong Xu2019-08-051-2/+3
| | |/ / / | |/| | |
* | | | | Merge topic 'clang-frontend-variant'Brad King2019-08-062-0/+32
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | | | | | | | | a245479372 clang: Work around toolchain file use of internal CMake variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3650