summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* FindCURL: provide imported target CURL::CURLRolf Eike Beer2018-03-061-0/+12
|
* Merge topic 'findjava-jar-in-dev-component'Brad King2018-02-281-4/+4
|\ | | | | | | | | | | | | 596a7f262a FindJava: Add Java_JAR_EXECUTABLE to a component: Development Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1807
| * FindJava: Add Java_JAR_EXECUTABLE to a component: DevelopmentGiel van Schijndel2018-02-271-4/+4
| | | | | | | | | | | | | | All discovered executables were placed in a component, except for 'jar'. This forced the use of find_package(Java) without any component specification. This commit adds 'jar' to the 'Development' component, because that's what it's used for.
* | Merge topic 'modules-restore-path-suffixes'Brad King2018-02-274-0/+11
|\ \ | |/ |/| | | | | | | | | 7b1c1424 Modules: Restore recently removed search path suffixes Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'ipo-support'Brad King2018-02-261-0/+28
|\ \ | | | | | | | | | | | | | | | | | | a18147e9 MSVC,Clang,Flang: Add IPO support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1721
| * | MSVC,Clang,Flang: Add IPO supportxoviat2018-02-231-0/+28
| | | | | | | | | | | | Fixes: #17692
* | | Merge topic 'fortran-compiler'Brad King2018-02-221-6/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 965f977c Fortran: Adjust compiler candidates based on host platform Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1780
| * | | Fortran: Adjust compiler candidates based on host platformxoviat2018-02-211-6/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Typical Fortran compiler command-line tool names differ on Windows and non-Windows platforms. Also, the name `ifc` should not be used on Windows because there is an `ifc.exe` tool in Visual Studio that is unrelated. Fixes: #17752
* | | Merge topic 'FindLua-tolerate-var'Brad King2018-02-211-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6cced787 FindLua: Fix error when LUA_INCLUDE_PREFIX is set as a variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1778
| * | | FindLua: Fix error when LUA_INCLUDE_PREFIX is set as a variableFrank Benkstein2018-02-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use `LUA_INCLUDE_PREFIX` for the result of an internal `find_path` call and unset the cache entry before each use. Unset a plain variable of this name too in case it was set by project code. Otherwise the `find_path` call may be skipped and the wrong value used, leading to errors.
* | | | Merge topic 'FindwxWidget/fix-eating-minusL-in-path'Brad King2018-02-211-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67db3ff9 Fix eating "-L" in path names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1775
| * | | | Fix eating "-L" in path namesRaffi Enficiaud2018-02-171-1/+1
| |/ / / | | | | | | | | | | | | | | | | When the path containing the wxLibraries contains a "-L", a "string(REPLACE "-L" ...) replaces the content and results in a wrong path. The regex fixes this.
* | | | Merge topic 'find-linker'Brad King2018-02-211-0/+19
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | e936b6bb CMakeFindBinUtils: Find linker in PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1720
| * | | CMakeFindBinUtils: Find linker in PATHxoviat2018-02-211-0/+19
| | | | | | | | | | | | | | | | Fixes: #17693
* | | | Merge topic 'ti-depfile-flag-fix'Brad King2018-02-201-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cab9af7e Compiler/TI: Fix depfile generation for C++ Acked-by: Kitware Robot <kwrobot@kitware.com> 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
* | | | Merge topic 'findzlib-folder-priority'Brad King2018-02-201-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c01eede8 FindZLIB: Search names per directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1769
| * | | | FindZLIB: Search names per directoryStefan Hacker2018-02-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindZLIB accepts various names for zlib (e.g. "z", "zlib", ...) in various search locations. Before this patch zlib ignored the priority implied by the search locations and instead prioritized based on the library name. Consequently ensuring the pick of a zlib from e.g. a CMAKE_PREFIX_PATH was not possible if it didn't have the highest priority name ("z"). This unexpected behavior led to bugs in third party projects (e.g. https://github.com/Microsoft/vcpkg/issues/1939). A common way to encounter the issue in the wild is on Windows with the popular Anaconda python distribution which puts a "z.lib" in a lib/ subdirectory reachable from a bin/ path in PATH. From then on cmake will always pick up this library instead of the one intended by the user. This patch adds the NAMES_PER_DIR option to the find_library calls made by FindZLIB making it search each directory for all names before considering lower priority directory names resolving these issues.
* | | | | Merge topic 'CheckCSourceRuns-log-run-output'Brad King2018-02-201-3/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b25b39ad CheckCSourceRuns: Teach CHECK_C_SOURCE_RUNS to log run output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1772
| * | | | | CheckCSourceRuns: Teach CHECK_C_SOURCE_RUNS to log run outputEdward Z. Yang2018-02-161-3/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | Signed-off-by: Edward Z. Yang <ezyang@fb.com> Fixes: #17745
* | | | | Merge topic 'follow-up-misc-typos'Brad King2018-02-208-8/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 287e7a17 Maint: misc. typos Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1771
| * | | | Maint: misc. typosluz.paz2018-02-168-8/+8
| |/ / / | | | | | | | | | | | | Found via `codespell`
* | | | Replaces execute_process calls to touch files with file(TOUCH) callsShane Parris2018-02-151-1/+1
|/ / /
* | | UseSWIG: modernize moduleMarc Chevrier2018-02-141-148/+337
| | |
* | | UseSWIG: Re-work test frameworkMarc Chevrier2018-02-141-0/+6
| |/ |/|
* | Merge topic 'more-misc-typos'Brad King2018-02-132-6/+6
|\ \ | | | | | | | | | | | | | | | | | | 193082a3 MAINT: Misc. typos Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1758
| * | MAINT: Misc. typosluz.paz2018-02-132-6/+6
| |/ | | | | | | Found via `codespell -q 3 -I ../cmake-whitelist.txt`.
* | 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
generated by cgit v0.12 at 2024-11-07 23:46:34 (GMT)