summaryrefslogtreecommitdiff
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'FindOpenMP-Intel-Windows' into release-3.11Brad King2018-04-161-13/+4
|\ | | | | | | Merge-request: !1957
| * FindOpenMP: Fix support for Intel on WindowsRoland Schulz2018-04-161-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.11.0-rc1~334^2 (FindOpenMP: Use NO_DEFAULT_PATH where appropriate, 2017-11-15) broke partial support for Intel on Windows. Since `OpenMP_${LANG}_IMPLICIT_LINK_DIRS` is empty for this compiler the `find_library` call without `NO_DEFAULT_PATH` worked accidentally in environments with the needed libraries in the search path already. Fix support for Intel on Windows by simply removing our explicit search for the `libiomp5md` library. In cases that it is needed, the compiler already inserts metadata in `.obj` files to tell the MSVC linker to use the library. Suggested-by: Christian Pfeiffer <cpfeiffer@live.de> Fixes: #17910
* | Merge branch 'implicit-lib-gcceh-file' into release-3.11Brad King2018-04-161-1/+1
|\ \ | | | | | | | | | Merge-request: !1967
| * | Exclude "libgcc_eh" library files from implicit link librariesBrad King2018-04-161-1/+1
| |/ | | | | | | | | | | | | | | Extend the fix in commit v3.9.6~1^2 (Restore exclusion of "gcc_eh" from implicit link libraries, 2017-11-07) to also exclude `gcc_eh` libraries referenced by absolute path to the library file. Issue: #17436
* | Merge branch 'features-msvc-2017' into release-3.11Brad King2018-04-111-21/+15
|\ \ | | | | | | | | | Merge-request: !1903
| * | Features: Record for VS 2017 through 15.6Daniel Filipe2018-04-111-21/+15
| |/ | | | | | | | | | | | | VS 15.3 has more features than we recorded in commit v3.7.0-rc1~156^2~2 (Features: Record features for VS 15 Preview 4, 2016-09-05). While at it, update comments and simplify some cases.
* | Revert "CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES"Brad King2018-04-043-9/+0
|/ | | | | | | | | | This reverts commit v3.11.0-rc1~108^2 (CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES, 2017-12-24). The behavior change can affect checks in existing projects that don't expect the behavior. Introducing the behavior again will require a policy. Fixes: #17874 Issue: #9514
* Merge branch 'boost-1.67' into release-3.11Brad King2018-03-211-41/+129
|\ | | | | | | Merge-request: !1865
| * FindBoost: Add support for Boost 1.67 with Python version suffixesRoger Leigh2018-03-211-41/+129
| | | | | | | | Fixes: #16612, #16335, #16391, #12955
* | Features: Record for SunPro 5.15Brad King2018-03-201-1/+5
|/ | | | Oracle Developer Studio 12.6 adds support for more C++ 11 features.
* Merge branch 'revert-findqt4-dirs-fix' into release-3.11Brad King2018-03-191-12/+1
|\ | | | | | | Merge-request: !1867
| * FindQt4: Revert "Set PLUGINS and IMPORTS dir even if empty"Brad King2018-03-191-12/+1
| | | | | | | | | | | | | | | | | | The change in commit v3.11.0-rc1~306^2 (FindQt4: Set PLUGINS and IMPORTS dir even if empty, 2017-11-19) regressed existing builds on some machines. Revert it for CMake 3.11 pending further investigation. Fixes: #17814, #17817 Issue: #14155, #17492
* | Merge branch 'intel-initializer-list' into release-3.11Brad King2018-03-161-5/+1
|\ \ | | | | | | | | | Merge-request: !1855
| * | Features: Record initializer list support for Intel 14 and aboveBrad King2018-03-161-5/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Features recorded by commit v3.6.0-rc1~120^2~5 (Features: Record standards and features for Intel C++ on UNIX, 2016-04-28) for the Intel compiler left out initializer list support because our test case in `Tests/CompileFeatures/cxx_generalized_initializers.cpp` caused an internal compiler error. It turns out this is because the Intel compiler asserts the `initializer_list` constructor signatures to verify that they match its own `<initializer_list>` header. It was our dummy implementation used to test the language feature without any headers that caused the ICE. Revise it to use a constructor signature accepted by the Intel compiler. Fixes: #17829
* | Merge branch 'gtest_discover_tests_timeout' into release-3.11Brad King2018-03-161-5/+16
|\ \ | | | | | | | | | Merge-request: !1851
| * | GoogleTest: Rename TIMEOUT parameter to avoid clashCraig Scott2018-03-151-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In gtest_discover_tests(), the TIMEOUT keyword was making it impossible to set the TIMEOUT test property via the PROPERTIES keyword. This would be a frequent case, but it doesn't complain and instead silently does something different to what would normally be expected. The TIMEOUT keyword has been renamed to DISCOVERY_TIMEOUT, thereby removing the clash. This is a breaking change. 3.10.1 and 3.10.2 were the only versions that supported the TIMEOUT keyword and uses of it were likely not working as intended. Fixes: #17801
* | | Merge branch 'xl-cc-default-std' into release-3.11Brad King2018-03-141-1/+2
|\ \ \ | | | | | | | | | | | | Merge-request: !1854
| * | | XL: Fix C default level detection when invoked as 'cc'Brad King2018-03-141-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The IBM XL C compiler does not define `__STDC__` when invoked as plain `cc` instead of `xlc`, so `CMAKE_C_STANDARD_COMPUTED_DEFAULT` does not get set and CMake fails. Teach CMake about the XL compiler's default C standard in this case. Fixes: #17649
* | | Merge branch 'findjni-mips-r6-new-arch' into release-3.11Brad King2018-03-141-1/+4
|\ \ \ | | | | | | | | | | | | Merge-request: !1853
| * | | FindJNI: add some new architecture names for mips release 6YunQiang Su2018-03-141-1/+4
| |/ /
* | | ExternalProject: Fix cache generation when last args ends with "-NOTFOUND"Jean-Christophe Fillion-Robin2018-03-121-4/+14
|/ /
* | Merge branch 'cuda-no-device-link-rsp' into release-3.11Brad King2018-03-071-0/+6
|\ \ | | | | | | | | | Merge-request: !1831
| * | CUDA: Do not pass unsupported @rspfile arguments to NVCCBrad King2018-03-071-0/+6
| | | | | | | | | | | | | | | | | | | | | The nvcc compiler does not support `@<rspfile>` arguments. It does offer a `--options-file` argument that can be investigated later. Fixes: #17797
* | | XL: Recognize compilers identified by __ibmxl__Brad King2018-03-064-10/+26
|/ / | | | | | | | | | | | | | | | | IBM XL C/C++ for Linux versions 13.1.6 and above no longer define `__IBMC__` or `__IBMCPP__` by default (see `-qxlcompatmacros`). Instead `__ibmxl__` now identifies the compiler along with some related new version macros. Fixes: #17784
* | Merge branch 'modules-restore-path-suffixes' into release-3.11Brad King2018-02-264-0/+11
|\ \ | | | | | | | | | Merge-request: !1802
| * | Modules: Restore recently removed search path suffixesBrad King2018-02-264-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.11.0-rc1~293^2~4 (Modules: Remove paths set as global Unix prefixes, 2017-11-20) removed `PATH_SUFFIXES` options that appeared to be used to cover subdirectories of the `PATHS` options that were also removed. However, the path suffixes also apply to other search paths and so should not be removed. Restore them. Fixes: #17760
* | | Merge branch 'ti-depfile-flag-fix' into release-3.11Brad King2018-02-201-1/+1
|\ \ \ | | | | | | | | | | | | Merge-request: !1774
| * | | Compiler/TI: Fix depfile generation for C++Grzegorz Dobinski2018-02-201-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | In commit v3.11.0-rc1~466^2 (Compiler/TI: Add support for depfile generation for Ninja, 2017-10-16) the flag for C++ was added in a variable with a typo in its name. Fix the spelling. Issue: #17360
* | | FindImageMagick: Add 7.0 library namesRoman Wüger2018-02-061-2/+2
|/ / | | | | | | | | For ImageMagick 7.0.x we need to consider `CORE_RL_MagickWand_` and `CORE_RL_MagickCore_`.
* | Merge topic 'autogen-improve-multi-config'Brad King2018-02-052-39/+0
|\ \ | | | | | | | | | | | | | | | | | | a8ee7406 Autogen: Improved multi-config include scheme Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1735
| * | Autogen: Improved multi-config include schemeSebastian Holtermann2018-02-022-39/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For multi configuration generators AUTOMOC generates the moc files that are included in `mocs_compilation.cpp` in `AUTOGEN_BUILD_DIR/include_$<CONFIG>/`. By doing so each configuration reads different moc files when compiling `mocs_compilation.cpp`. Since we do not (need to) rewrite `mocs_compilation.cpp` on a configuration change anymore, the files also does not need to be recompiled anymore. Not having to rewrite and recompile `mocs_compilation.cpp` on a configuration change anymore was the main objective of this patch. In a similar fashion AUTORCC generates a `qrc_BASE_CMAKE.cpp` file below `AUTOGEN_BUILD_DIR/include_$<CONFIG>/` and `qrc_BASE.cpp` becomes a mere wrapper that includes this actuall rcc output file (when using multi configuration generators). The template files `Modules/AutoRccInfo.cmake.in` and `Modules/AutogenInfo.cmake.in` were removed in favor of writing the info `.cmake` files manually. Closes #17230
* | | UseSWIG: Restore support for like-named .i files in different modulesMarc Chevrier2018-02-021-2/+4
|/ / | | | | | | | | | | | | | | | | | | | | Fix logic added by commit 2ee10119ea (swig: fix incremental build in case of removed interface files, 2017-11-06). Name the extra targets added for Makefile generators using both the module name and .i base name to avoid collisions across modules. Also make sure the extra targets added for all .i files in a module are added as dependencies instead of just the last one. Fixes: #17704
* | Merge topic 'UseSWIG-doc-clarify'Brad King2018-02-011-52/+64
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | b844a414 UseSWIG: Clarify documentation of SWIG_OUTFILE_DIR 315b0927 UseSWIG: Improve documentation markup ce130c7a UseSWIG: Convert docs to a bracket comment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1733
| * | UseSWIG: Clarify documentation of SWIG_OUTFILE_DIRNoel Eck2018-01-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The `SWIG_OUTFILE_DIR` variable provides the option to specify an output directory location. This commit removes portion stating that this is equal to the `swig -o` option since it does not set the output filename. Fixes: #17703 Signed-off-by: Noel Eck <noel.eck@intel.com>
| * | UseSWIG: Improve documentation markupBrad King2018-01-311-31/+42
| | |
| * | UseSWIG: Convert docs to a bracket commentBrad King2018-01-311-52/+53
| | |
* | | Merge topic 'findmpi-linker-parsing-enh'Brad King2018-02-011-92/+281
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0def3604 FindMPI: Discard IMPI boilerplate text 9ecbec5e FindMPI: Support for IMPI's compiler check 76755367 FindMPI: Set up environment variables for wrapper e7c0298d FindMPI: Retain unused link paths 8cddc899 FindMPI: Use more CMake variables 8b79107a FindMPI: Improve link information parsing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1694
| * | FindMPI: Discard IMPI boilerplate textChristian Pfeiffer2018-01-311-0/+4
| | | | | | | | | | | | | | | | | | Intel MPI on Windows prefixes all outputs with some boilerplate copyright text. By discarding it, we should prevent any potential clashes with our regex parsing.
| * | FindMPI: Support for IMPI's compiler checkChristian Pfeiffer2018-01-311-0/+27
| | | | | | | | | | | | | | | | | | Intel MPI has an optional feature to check compatibility with the compiler, given by I_MPI_CHECK_COMPILER. This commit adds support for executing that check.
| * | FindMPI: Set up environment variables for wrapperChristian Pfeiffer2018-01-311-5/+80
| | | | | | | | | | | | | | | | | | For MPICH derivates and Intel MPI, we can improve the compiler wrapper behavior and accuracy by defining certain environment variables if they haven't been set otherwise.
| * | FindMPI: Retain unused link pathsChristian Pfeiffer2018-01-301-6/+18
| | | | | | | | | | | | | | | | | | If our ``find_library`` step hasn't used a particular link directory at all, it's best to retain it in order to prevent issues from secondary dependencies not being found.
| * | FindMPI: Use more CMake variablesChristian Pfeiffer2018-01-301-59/+118
| | | | | | | | | | | | | | | | | | | | | | | | This replaces hardcoded expectations of flags like -l and -L with a dynamical solution based on CMake platform variables. Furthermore, the linker flag parsing is dynamified to support more forms and given linker paths are now removed properly from the linker flags.
| * | FindMPI: Improve link information parsingChristian Pfeiffer2018-01-251-53/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | The parsing of link information coming from the compiler wrapper has been improved: - Support MSVC /link argument separation properly and add support for potential VC++ link flags - Rely on the global import/static/shared library suffixes instead of hardcoded special values. This should improve compatibility with Cygwin and MinGW should any MPI implementation there need this behavior. - Don't use ``find_library`` if the full path of a library is known anyways.
* | | Merge topic 'CheckIPOSupported-doc-Fortran'Brad King2018-01-311-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9e341f05 CheckIPOSupported: Document existing Fortran support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1727
| * | | CheckIPOSupported: Document existing Fortran supportBrad King2018-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | Support was added by commit v3.9.0-rc1~318^2 (CheckIPOSupported: Add Fortran support, 2017-04-02) but the documentation was not updated.
* | | | Merge topic 'adsp-asmembler-identification'Brad King2018-01-311-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f83330ed ASM: ADSP assembler identification Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1723
| * | | | ASM: ADSP assembler identificationAnton Danielsson2018-01-301-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Add support to identify the ADSP (Analog Devices) assembler in CMakeDetermineASMCompiler. Fixes: #17695
* | | | FindCUDA: Fix regression in per-config flagsBrad King2018-01-301-0/+12
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Changes in commit 48f7e2d300 (Unhardcode the CMAKE_CONFIGURATION_TYPES values, 2017-11-27) accidentally left `CUDA_configuration_types` undefined, but this is used in a few places to handle per-config flags. Restore it. Fixes: #17671
* | | Merge topic 'intel-cxx17-flags'Brad King2018-01-292-1/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3d576f5 Intel: Add C++17 compiler options 4a5727d3 Intel: Correct the C11 ext flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1711
| * | | Intel: Add C++17 compiler optionsChristian Pfeiffer2018-01-271-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Intel C++ 18.0, some C++17 features are supported if the flags -std=c++17, respectively /Qstd=c++17 are given. Fixes: #17687
View Lorry Controller Status