summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindBoost-limit-configs'Brad King2017-09-071-16/+32
|\ | | | | | | | | | | | | e6159e18 FindBoost: Add option to prevent finding DEBUG/RELEASE Boost-libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1216
| * FindBoost: Add option to prevent finding DEBUG/RELEASE Boost-libsDeniz Bahadir2017-09-061-16/+32
| | | | | | | | | | | | | | | | | | | | With the use of options `Boost_USE_DEBUG_LIBS` and `Boost_USE_RELEASE_LIBS` it is now possible to skip searching for either DEBUG or RELEASE Boost libraries. This is useful if Boost is installed on the system in multiple directories but only one of them should be used which only contains e.g. the RELEASE libraries. Without this change the DEBUG libraries might be found in the other directory which might not be desired at all.
* | Merge topic 'findexpat-importedtargets'Brad King2017-09-071-7/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 3a4f82e9 Help: Add notes for topic 'FindEXPAT-importedtargets' bfe51369 FindEXPAT: Add unit test of target and variables 78f166f8 FindEXPAT: Add imported target and documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1207
| * | FindEXPAT: Add imported target and documentationBen Morgan2017-09-011-7/+28
| | |
* | | Merge topic 'irsl-vs15-future'Brad King2017-09-071-19/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6dd0a593 Merge branch 'backport-irsl-vs15-future' into irsl-vs15-future 1dd2c08b InstallRequiredSystemLibraries: Add support for future VS 2017 toolchains Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Christian Pfeiffer <cpfeiffer@live.de> Merge-request: !1240
| * \ \ Merge branch 'backport-irsl-vs15-future' into irsl-vs15-futureBrad King2017-09-061-19/+16
| |\ \ \
| | * | | InstallRequiredSystemLibraries: Add support for future VS 2017 toolchainsBrad King2017-09-061-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assume that all cl 19.xx versions will use the same runtime DLL pattern. Suggested-by: Tomasz Słodkowicz <slodki@users.noreply.github.com>
| | * | | Merge branch 'InstallRequiredSystemLibraries-vs15.3' into release-3.9Brad King2017-08-221-11/+31
| | |\ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1168
| | * \ \ \ Merge branch 'revert-macos-hidpi-qt-dialog' into release-3.9Brad King2017-08-221-4/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1167
| | * \ \ \ \ Merge branch 'debian_clang_binutils' into release-3.9Brad King2017-08-151-0/+8
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1127
| | * \ \ \ \ \ Merge branch 'cuda-device-link-ccbin' into release-3.9Brad King2017-08-151-2/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1138
* | | \ \ \ \ \ \ Merge topic 'msvc2015-cxx17'Brad King2017-09-061-1/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 227e3535 MSVC: Extend C++ language standard support to Visual Studio 2015 Update 3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1227
| * | | | | | | | MSVC: Extend C++ language standard support to Visual Studio 2015 Update 3Nils Gladitz2017-09-011-1/+4
| | | | | | | | |
* | | | | | | | | Merge topic 'FindBoost-fix-policy-scope'Brad King2017-09-061-9/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ade45fa3 FindBoost: Revert "Simplify search in lists." Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1238
| * | | | | | | | | FindBoost: Revert "Simplify search in lists."Brad King2017-09-051-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.9.0-rc1~41^2 (FindBoost: Simplify search in lists, 2017-04-23). It regressed the module by exposing issue #17257, but the fix for that issue is not suitable for inclusion in a patch release. It is simplest to revert the commit until the larger problem can be addressed. Fixes: #17252
* | | | | | | | | | Merge topic 'findopenmp-found'Brad King2017-09-061-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91fbda82 FindOpenMP: Restore OpenMP_FOUND result variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1233
| * | | | | | | | | | FindOpenMP: Restore OpenMP_FOUND result variableChristian Pfeiffer2017-09-051-0/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The overhaul in commit v3.9.0-rc1~207^2~1 (FindOpenMP: Complete overhaul, 2017-04-24) documented this variable but accidentally left it unset. Fixes: #17251
* | | | | | | | | | Merge topic 'android-ndk-r16'Brad King2017-09-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a1a1177 Android: Update for NDK r16 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Daniel Seither <d@fdseither.de> Merge-request: !1237
| * | | | | | | | | | Android: Update for NDK r16Brad King2017-09-051-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since NDK commit 90ec78ffd96b87cd75d82575587ead14d6494df1 (Remove Clang toolchain path from setup.mk, 2017-05-31) the `setup.mk` files for Clang no longer hold the path to the `toolchains/llvm` directory. It has been the same since NDK r11, so use that as the default. Fixes: #17253
* | | | | | | | | | Merge topic 'csharp_fix_initial_flags'Brad King2017-09-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3388900 VS: Initialize CSharp flags consistently Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1232
| * | | | | | | | | | VS: Initialize CSharp flags consistentlyMichael Stürmer2017-09-051-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same environment variable for the initial flags that we use for the compiler id. Fixes: #17250
* | | | | | | | | | Merge topic 'ExternalProject-command'Brad King2017-09-051-0/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15617484 ExternalProject: Prevent COMMAND from being treated as a true keyword Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1178
| * | | | | | | | | | ExternalProject: Prevent COMMAND from being treated as a true keywordCraig Scott2017-09-021-0/+8
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The known keywords for each function are obtained by scraping the documentation for lines matching a particular regular expression. In commit 8842a027 (ExternalProject: Improve documentation, 2017-07-09), the docs were overhauled and the COMMAND docs subsequently matched the regular expression when they shouldn't have. This made COMMAND appear as a true keyword, which thwarted the special handling logic elsewhere for the intended use of COMMAND arguments. This commit contains a workaround for issue #17229 to force a dependency of the patch step on the update step to ensure a predictable step order. Fixes: #17198
* | | | | | | | | | FindPatch: Add module to find 'patch' command-line toolJean-Christophe Fillion-Robin2017-09-011-0/+68
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'flang'Brad King2017-09-015-2/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8e03e9b FindOpenMP: Add Flang flag. 2f3a07a9 Flang: Add support for flang Fortran compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1141
| * | | | | | | | | FindOpenMP: Add Flang flag.Tin Huynh2017-08-311-0/+1
| | | | | | | | | |
| * | | | | | | | | Flang: Add support for flang Fortran compilerTin Huynh2017-08-314-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flang is a Fortran compiler built on top of clang [1]. Because flang shares a lot of commonalities with clang, the flang module piggybacks off the clang module and overrides certain options. Add flang to Fortran compiler auto find list. Update flang preprocessor macros to differentiate from PGI. Add Flang-FindBinUtils. [1] https://github.com/flang-compiler/flang
* | | | | | | | | | Merge topic 'FindThreads-cross-compile-no-try_run'Brad King2017-09-012-44/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4e551a9 FindThreads: Drop try_run to improve cross-compiling support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1109
| * | | | | | | | | FindThreads: Drop try_run to improve cross-compiling supportSteffen Dettmer2017-08-302-44/+11
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `try_compile` instead of `try_run`. It is not clear why `try_run` was ever needed, and it does not work during cross-compiling. Update the check's source file to remove code associated with actually running things. Also remove the ancient `__CLASSIC_C__` code path and use a simple `int main(void)` as in `Modules/CheckIncludeFile.c.in`. Fixes: #16920
* | | | | | | | | Merge topic 'irsl-intel'Brad King2017-08-311-1/+139
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd4406f3 IRSL: Add Intel compiler support 8444252f IRSL: Install VC++ OpenMP libraries only for MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Pelle <pbregener@gmail.com> Merge-request: !1121
| * | | | | | | | IRSL: Add Intel compiler supportChristian Pfeiffer2017-08-301-2/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16891 Fixes: #9903
| * | | | | | | | IRSL: Install VC++ OpenMP libraries only for MSVCChristian Pfeiffer2017-08-231-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment, the Visual C++ OpenMP libraries will be installed for all compilers simulating MSVC. They should however only be provided if we're dealing with actual MSVC.
* | | | | | | | | Merge topic 'gettext-windows'Brad King2017-08-301-2/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb3a608f FindGettext: fix support for MS Windows gettext binaries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1192
| * | | | | | | | | FindGettext: fix support for MS Windows gettext binariesTomasz Słodkowicz2017-08-301-2/+6
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes it uses filename with .exe extension so try to match filename with and without extension.
* | | | | | | | | FindwxWidgets: Add support for Windows XP compatible builsTomasz Słodkowicz2017-08-301-0/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Microsoft has dedicated toolset versions for XP compatible binaries (v110 vs. v110_xp, v141 vs. v141_xp) and CMake doesn't find wxWidgets compiled with _xp tools. This patch adds _xp to directories searched for wxWin libraries.
* | | | | | | | Merge topic 'cpackifw-repositories-directories'Brad King2017-08-281-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5fe64511 CPackIFW: Add CPACK_IFW_REPOSITORIES_DIRECTORIES variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1150
| * | | | | | | | CPackIFW: Add CPACK_IFW_REPOSITORIES_DIRECTORIES variableKonstantin Podsvirov2017-08-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CPACK_IFW_REPOSITORIES_DIRECTORIES variable to specify additional repositories dirs that will be used to resolve and repack dependent components
* | | | | | | | | Merge topic 'FindQt4-do-not-assume-all-libraries-are-frameworks'Brad King2017-08-281-6/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33161f48 FindQt4: Do not assume all libraries are frameworks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1169
| * | | | | | | | | FindQt4: Do not assume all libraries are frameworksJean-Christophe Fillion-Robin2017-08-211-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since on MacOSX not all modules are available as "framework" (e.g libQtUiTools.a), the assumption made in "FindQt4.cmake" is not always valid and systematically setting the imported libraries location to framework location is incorrect. This commit increases the robustness of the logic by first checking if the location exists. Fixes #17195
* | | | | | | | | | GNUToMS: Tolerate existence of a %USERPROFILE%/source directoryAlbert Ziegenhagel2017-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VS environment script we load changes the working directory to `%USERPROFILE%/source` if it exists. Set `VSCMD_START_DIR` to tell the script to retain the current working directory.
* | | | | | | | | | Merge topic 'modernize-git-whitespace-attributes'Brad King2017-08-252-14/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ed03baa gitattributes: prefer `eol=crlf` to `-crlf` 40470031 MumpsCoverage: remove unnecessary attribute d20485d8 gitattributes: prefer `eol=lf` to `crlf=input` b85c2589 gitattributes: prefer `-text` for binary files 377f3685 gitattributes: remove unused attributes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1173
| * | | | | | | | | | gitattributes: prefer `eol=crlf` to `-crlf`Ben Boeckel2017-08-232-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `crlf` attribute is deprecated in Git. This also changes the given files to be in the index using LF newlines, but they will be checked out with CRLF newlines due to the attribute.
* | | | | | | | | | | Merge topic 'ninja-cl-intl'Brad King2017-08-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de9840d1 Ninja: Fix support for MSVC with non-English output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1179
| * | | | | | | | | | | Ninja: Fix support for MSVC with non-English outputBrad King2017-08-231-0/+1
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With MSVC the Ninja generator extracts the `cl -showIncludes` prefix. When MSVC is configured to have non-English output, e.g. via `VSLANG=2052` in the environment, then `cl` prints the prefix encoded for the current code page, which is not necessarily UTF-8 encoding. Currently we fail to convert the prefix to our internal UTF-8 encoding, but assume it is UTF-8 later. While writing `rules.ninja`, the Ninja generator converts our internal UTF-8 encoding to the current code page. The `msvc_deps_prefix =` line needs to be encoded as the current code page so that `ninja` can match in the output from `cl -showIncludes` during the build. Prior to commit v3.9.0-rc1~47^2 (codecvt: Re-implement do_out and do_unshift, 2017-05-25), the non-UTF-8 prefix extracted above was written without noticing its incorrect internal encoding. The `rules.ninja` file was successfully written, but possibly with a mangled `msvc_deps_prefix`. Since that commit the output stream correctly rejects the non-UTF-8 byte sequence and writing `rules.ninja` fails. Fix this by correctly converting the `cl -showIncludes` output from the current code page to our internal UTF-8 encoding. Fixes: #17191
* | | | | | | | | | | Merge topic 'boost-1.65'Brad King2017-08-241-3/+27
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa114e7d FindBoost: Add Boost 1.65 dependencies e66e8e89 BoostScanDeps: Special case python and numpy and variants Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1172
| * | | | | | | | | | | FindBoost: Add Boost 1.65 dependenciesRoger Leigh2017-08-221-3/+27
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'ninja-gfortran-fpreprocessed'Brad King2017-08-241-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90a34ff7 Ninja: Fix references to source files in gfortran diagnostics Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1146
| * | | | | | | | | | Ninja: Fix references to source files in gfortran diagnosticsRaul Laasner2017-08-231-0/+2
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja generator preprocesses and compiles separately for Fortran. When compiling, tell gfortran that the source is already preprocessed so that it will honor the `# <line>` directives when producing diagnostics messages. Fixes: #17160
* | | | | | | | | | Merge topic 'FindCurses-wide'Brad King2017-08-231-30/+81
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72343d26 Help: Add notes for topic 'FindCurses-wide' 4b02afc0 FindCurses: Add option for ncursesw detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1161
| * | | | | | | | | | FindCurses: Add option for ncursesw detectionAlexandr (Sagrer) Gridnev2017-08-221-30/+81
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a remake of the patch from issue #10347 but based on current master. Works for me on Lubuntu 17.04. Fixes: #10347