summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'android-versioned-soname'Brad King2019-03-061-3/+5
|\ | | | | | | | | | | | | 64e2c14c4a Android: allow user to enable versioned soname Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3063
| * Android: allow user to enable versioned sonameTom Yan2019-03-051-3/+5
| |
* | Merge topic 'ios-variable'Brad King2019-03-061-0/+2
|\ \ | |/ |/| | | | | | | | | e427c7c1d8 iOS: Add IOS variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3051
| * iOS: Add IOS variableRuslan Baratov2019-03-051-0/+2
| | | | | | | | | | | | | | Since commit 11da882a12 (Apple: Introduce separate system name for iOS, tvOS, and watchOS, 2018-01-15, v3.14.0-rc1~14^2~1) we support setting `CMAKE_SYSTEM_NAME` to `iOS`. Existing iOS toolchain files already set `IOS` as a short-hand variable, so do the same here.
* | Merge topic 'llvm-rc'Brad King2019-03-042-3/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | e53a968ed5 MSVC: Use -D instead of /D in RC_FLAGS 1a281a1acd RC: Pass output file in a way that llvm-rc 7 and below understand fa339ced67 CMakeVersion.rc: Avoid preprocessor definitions to support llvm-rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3007
| * | MSVC: Use -D instead of /D in RC_FLAGSZsolt Parragi2019-03-011-2/+4
| | | | | | | | | | | | llvm-rc can't handle definitions given with /D and without a space.
| * | RC: Pass output file in a way that llvm-rc 7 and below understandZsolt Parragi2019-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | Prior to LLVM 8.0, `llvm-rc` does not recognize `/fo` without a space after it. Add the space unconditionally because MS `rc` accepts it too. Issue: #18957
* | | Merge topic 'FindPython-NumPy-fix-include-dir'Brad King2019-03-041-2/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8e3358336d FindPython: Fix NumPy component include directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3053
| * | | FindPython: Fix NumPy component include directoryMarc Chevrier2019-03-041-2/+1
| | |/ | |/| | | | | | | | | | | | | | | | Update the component added by commit 513e77550d (FindPython: Introduce NumPy component, 2018-12-12, v3.14.0-rc1~95^2). The `numpy/` sub-directory should not be part of the include directory. It should be part of the `#include` line.
| * | Merge branch 'findjni-paths' into release-3.14Brad King2019-03-011-52/+47
| |\ \ | | | | | | | | | | | | Merge-request: !3042
| * \ \ Merge branch 'ExternalProject-fix-log-in-custom-stamp' into release-3.14Brad King2019-03-011-2/+14
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !3045
| * \ \ \ Merge branch 'FindThreads-revert-libc-check' into release-3.14Brad King2019-02-271-11/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3022
| * \ \ \ \ Merge branch 'FindOctave-remove' into release-3.14Brad King2019-02-271-179/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3027
| * \ \ \ \ \ Merge branch 'vs-llvm-extension' into release-3.14Brad King2019-02-271-2/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3024
| * \ \ \ \ \ \ Merge branch 'qcc-asm-detection' into release-3.14Brad King2019-02-252-0/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3016
| * \ \ \ \ \ \ \ Merge branch 'check_lang_source_runs_output' into release-3.14Brad King2019-02-252-2/+12
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3011
| * \ \ \ \ \ \ \ \ Merge branch 'asm-no-slash-question' into release-3.14Brad King2019-02-193-3/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2984
| * \ \ \ \ \ \ \ \ \ Merge branch 'fix-legacy-implicit-includes' into release-3.14Brad King2019-02-192-3/+17
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2981
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'FindBoost-layout-tagged' into release-3.14Brad King2019-02-191-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2961
* | \ \ \ \ \ \ \ \ \ \ \ Merge topic 'ExternalProject-fix-log-in-custom-stamp'Brad King2019-03-011-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6d3fee77c ExternalProject: Restore default log dir with custom stamp dir Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3045
| * | | | | | | | | | | | ExternalProject: Restore default log dir with custom stamp dirBrad King2019-03-011-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit b6f6cac378 (ExternalProject: add LOG_DIR option that allows overriding of log location, 2018-10-12, v3.14.0-rc1~515^2~1) the log directory got its own option. The intention was to fall back to the stamp directory by default. However, the implementation actually only falls back to the same default as the stamp directory and does not consider a custom stamp dir. Update the default log dir computation to fall back to whatever is the final selection for the stamp dir. Fixes: #19000
* | | | | | | | | | | | | Merge topic 'findjni-paths'Brad King2019-03-011-52/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77cede0977 FindJNI: Unify path search, fix support for Java 9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3042
| * | | | | | | | | | | | FindJNI: Unify path search, fix support for Java 9Christian Pfeiffer2019-03-011-52/+47
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java 9 restructured the standard location of the AWT libraries due to the removal of the JRE/JDK separation. We should check all possible combinations of subdirectories to the Java root directories to ensure that the libraries will be found after an upgrade. Furthermore, a root directory would contain both, include and library paths, so the search should be unified to ease maintenance on the module.
* | | | | | | | | | | | Merge topic 'processor_count_linux_containers'Brad King2019-03-011-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f20eab9cdc ProcessorCount: Return the container CPU count instead of the host count Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3032
| * | | | | | | | | | | | ProcessorCount: Return the container CPU count instead of the host countSylvain Joubert2019-02-271-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Linux containers (tested with LXC and Docker) getconf returns the host CPU count. Use nproc with a higher priority if available to get the container's allocated CPUs instead of the non-accessible host count.
* | | | | | | | | | | | | Merge topic 'drop-MIPSpro'Brad King2019-03-011-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e21bae378d WCDH: Restore definition for <prefix>_COMPILER_IS_MIPSpro Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3043
| * | | | | | | | | | | | | WCDH: Restore definition for <prefix>_COMPILER_IS_MIPSproBrad King2019-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code removed for MIPSpro by commit 214fcefa52 (Remove now-unused code once used for MIPSpro on IRIX, 2019-02-21) actually changed a public-facing API by dropping the `<prefix>_COMPILER_IS_MIPSpro` definition from the generated compiler detection header. Restore the definition hard-coded to `0` since the compiler will never be MIPSpro. Reported-by: Hans Johnson <hans-johnson@uiowa.edu>
* | | | | | | | | | | | | | Merge topic 'FindThreads-revert-libc-check'Brad King2019-02-281-11/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18320230ec FindThreads: Revert libc symbol check to pthread_create e0267eb1d3 FindThreads: Fix libc check to use proper header for pthread_kill Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Rolf Eike Beer <eike@sf-mail.de> Merge-request: !3022
| * | | | | | | | | | | | | FindThreads: Revert libc symbol check to pthread_createBrad King2019-02-271-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e9a1ddc594 (FindThreads: Replace the pthread symbol checking in libc., 2018-11-18, v3.14.0-rc1~292^2) we check libc for `pthread_kill` instead of `pthread_create`. However, on FreeBSD `pthread_kill` is in libc but not `pthread_create`. Discussion in the original merge request for the above commit also considered `pthread_key_create`, `pthread_self`, and `pthread_attr_init`. Every symbol seems to have some reason it is not an appropriate choice. Revert to the pre-3.14 behavior of using `pthread_create` pending further investigation.
| * | | | | | | | | | | | | FindThreads: Fix libc check to use proper header for pthread_killBrad King2019-02-261-2/+4
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit e9a1ddc594 (FindThreads: Replace the pthread symbol checking in libc., 2018-11-18, v3.14.0-rc1~292^2) we switched to checking for `pthread_kill` in libc but did not update the symbol check's header file to match. Add `signal.h` to get `pthread_kill`. Keep `pthread.h` anyway since the purpose of the check is to verify that the pthread API works. Fixes: #18984
* | | | | | | | | | | | | Merge topic 'FindOctave-remove'Brad King2019-02-271-179/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a1f3fe041 FindOctave: Remove module pending further work Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3027
| * | | | | | | | | | | | FindOctave: Remove module pending further workBrad King2019-02-261-179/+0
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `FindOctave` module added by commit 170bcb6fdc (FindOctave: Add module to find GNU octave, 2018-11-17, v3.14.0-rc1~283^2) has a few problems in its implementation that need to be worked out before the module can be included in a CMake release. These were missed during review. Remove the module for now. It can be restored later with a fresh review. Issue: #18991
* | | | | | | | | | | | Merge topic 'vs-llvm-extension'Brad King2019-02-271-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | / / | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8375c303e2 VS: Fix detection of clang-cl with -T llvm Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3024
| * | | | | | | | | | VS: Fix detection of clang-cl with -T llvmBrad King2019-02-261-2/+9
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a VS generator with `-T llvm`, MSBuild relies on the "LLVM Compiler Toolchain" VS Extension. This does not put `clang-cl` in the `PATH` inside the build, and LLVM no longer provides a `cl` replacement either. Therefore we need another way to extract the path to the `CMAKE_{C,CXX}_COMPILER`. Fortunately the LLVM VS integration provides a `$(ClangClExecutable)` macro we can reference to get the path. Fixes: #18983
* | | | | | | | | | Merge topic 'cpack-rpm++'Brad King2019-02-261-1/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3ffe90598 CPackRPM: Fix packaging in folders with ++ in name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3008
| * | | | | | | | | | CPackRPM: Fix packaging in folders with ++ in nameHarry Mallon2019-02-251-1/+8
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Construct a regex that can match a path with special characters instead of treating the path as a regex directly. Fixes: #18967
* | | | | | | | | | Merge topic 'add-xlclang'Brad King2019-02-2618-111/+146
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9d285c5ad jsoncpp: Fix include order for build within CMake 0d489fab19 libuv: fix atomic ops compilation with xlclang 1699f5c231 Utilities: Suppress warnings in third-party code when using XLClang f709089d84 XLClang: Extract compiler implicit include directories 5c41386357 XLClang: Add policy CMP0089 to present as XL for compatibility 8278237933 XL: Remove overlap with the new XLClang compiler ID 6f5cf2d2c6 XL: Revert "Recognize compilers identified by __ibmxl__" 90c6156aa8 XLClang: Add a new compiler ID for the clang-based XL compiler ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2921
| * | | | | | | | | | XLClang: Extract compiler implicit include directoriesBrad King2019-02-251-2/+4
| | | | | | | | | | |
| * | | | | | | | | | XL: Remove overlap with the new XLClang compiler IDChuck Atkins2019-02-252-60/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 6555286c55 (XL: Add C and C++ language level flags, 2017-04-27, v3.9.0-rc1~184^2) we added support for both the traditional XL compiler and the Clang-based variant used on Linux. The latter is now handled by `Modules/Compiler/XLClang-{C,CXX}.cmake` using the `XLClang` compiler id. Drop the corresponding content from the traditional XL compiler modules.
| * | | | | | | | | | XL: Revert "Recognize compilers identified by __ibmxl__"Brad King2019-02-254-26/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit eb1a9be4b6 (XL: Recognize compilers identified by __ibmxl__, 2018-03-05, v3.11.0-rc3~4^2). It is no longer needed because we now use `__ibmxl__` to identify with compiler id `XLClang`.
| * | | | | | | | | | XLClang: Add a new compiler ID for the clang-based XL compilerChuck Atkins2019-02-259-0/+95
| | | | | | | | | | |
| * | | | | | | | | | XL: Look for CreateExportList only on AIXBrad King2019-02-252-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tool comes with XL on AIX but not on Linux. Move the infrastructure to find and use it to the AIX-specific modules.
| * | | | | | | | | | XL: Record C compiler version that started using C99 by defaultChuck Atkins2019-02-251-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'qcc-asm-detection'Brad King2019-02-262-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be87ce43f0 Add ASM Compiler detection for QCC Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Bartosz <gang65@poczta.onet.pl> Merge-request: !3016
| * | | | | | | | | Add ASM Compiler detection for QCCMaikel van den Hurk2019-02-252-0/+6
| | | | | | | | | |
* | | | | | | | | | Merge topic 'drop-MIPSpro'Brad King2019-02-258-33/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 214fcefa52 Remove now-unused code once used for MIPSpro on IRIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3004
| * | | | | | | | | Remove now-unused code once used for MIPSpro on IRIXBrad King2019-02-218-33/+2
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit beb991110d (Remove now-unused code once used on IRIX, 2019-01-11, v3.14.0-rc1~167^2) we removed remnants of IRIX support. Also remove remnants of MIPSpro compiler support.
* | | | | | | | | Merge topic 'check_lang_source_runs_output'Brad King2019-02-252-2/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 92d9ec9bfb CheckLangSourceRuns: Capture run output to log files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3011
| * | | | | | | CheckLangSourceRuns: Capture run output to log filesCraig Scott2019-02-232-2/+12
| | |/ / / / / | |/| | | | | | | | | | | | Fixes: #18973
* | | | | | | Merge topic 'cray-cleanup'Brad King2019-02-202-81/+102
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d59159afdb Cray: clean up CrayPrgEnv and CrayLinuxEnvironment modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2945