summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'android-unified-headers'Brad King2017-06-221-2/+6
|\ | | | | | | | | | | | | 5d317930 Android: Fix include path for unified headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !997
| * Android: Fix include path for unified headersBrad King2017-06-221-2/+6
| | | | | | | | | | | | | | | | | | In commit v3.9.0-rc3~3^2 (Android: Add support for unified headers, 2017-06-12) we accidentally constructed the unified header include directories from the linking sysroot. Construct them from the compiling sysroot instead. Fixes: #16584
* | Merge topic 'CheckTypeSize-arm-archs'Brad King2017-06-211-0/+6
|\ \ | | | | | | | | | | | | | | | | | | 72ccb9f4 CheckTypeSize: Add support for arm architectures Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !989
| * | CheckTypeSize: Add support for arm architecturesDouglas McKenzie2017-06-201-0/+6
| | | | | | | | | | | | | | | | | | | | | This adds detection for `armv7`, `armv7s` and `arm64` when performing type size checks on universal binaries for iOS. Fixes: #16992
* | | Merge topic 'FindICU-data-vars'Brad King2017-06-201-24/+68
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3566af83 FindICU: Search for packaged data files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !981
| * | | FindICU: Search for packaged data filesRoger Leigh2017-06-171-24/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The files Makefile.inc and pkgdata.inc are installed by ICU to <libdir>/icu and on some distributions to <libdir>/<arch>/icu. These are required by ICU tools like pkgdata, and so are needed by other package build systems at build time, in addition to the libraries and executables already searched for. Search for the files and create cache entries for them, as done for executables.
* | | | Merge topic 'FindwxWidgets-fix-flag-parse'Brad King2017-06-201-19/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7a0bf86 FindwxWidgets: Fix parsing of cxxflags when paths contain -D or -I Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !975
| * | | | FindwxWidgets: Fix parsing of cxxflags when paths contain -D or -IThierry Crozat2017-06-191-19/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Use proper command-line parsing rather than accidentally matching content in the middle of paths that looks like flags. Fixes: #16986
* | | | Merge topic 'curses-form-advanced'Brad King2017-06-201-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 8b53dee2 FindCurses: mark CURSES_FORM_LIBRARY as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !978
| * | | FindCurses: mark CURSES_FORM_LIBRARY as advancedDaniel Pfeifer2017-06-171-0/+1
| |/ /
* | | Merge topic 'vs_csharp_fix_win32manifest_param'Brad King2017-06-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ec7b3af7 Vs: remove /nowin32manifest from C# flags to enable default VS behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !969
| * | | Vs: remove /nowin32manifest from C# flags to enable default VS behaviorMichael Stürmer2017-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | if /nowin32manifest is specified, it will be preferred over any occurring /win32manifest:<file> parameter Fixes: #16969, #16970
* | | | Merge topic 'FindHDF5-parallel-from-wrapper'Brad King2017-06-191-21/+27
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 8b9d8c4d FindHDF5: Fix parallel detection when primary compiler is an HDF5 wrapper Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !974
| * | | FindHDF5: Fix parallel detection when primary compiler is an HDF5 wrapperChuck Atkins2017-06-161-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is covering a different use case where your primary compilers are HDF5 wrappers, as is the case when using the Cray Programming Environment. The existing code tries to query the compiler using options only available to h5cc and friends, which doesn't work when your wrapper is not h5cc, as is the case with the CrayPE. This change instead pulls strings out of a test binary when testing for "is your regular compiler an HDF5 wrapper" while the "query wrapper for options" is reserved for the "I found the hdf5 wrappers but they're not your main compiler" mode.
| * | | Merge branch 'cuda-dlink-no-deprecated-gpu' into release-3.9Brad King2017-06-132-4/+21
| |\ \ \
| * \ \ \ Merge branch 'doc-pkgconfig-list' into release-3.9Brad King2017-06-121-1/+7
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | Check*CompilerFlag: Rewrite documentation of these modulesBrad King2017-06-153-60/+90
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Format with modern markup. Clarify that the setting of `CMAKE_REQUIRED_DEFINITIONS` is temporary. Add a note warning about contamination of the checks by `CMAKE_<LANG>_FLAGS`. Issue: #16973
* | | | Merge topic 'UseSWIG-avoid-dllimport-repeat'Brad King2017-06-151-4/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76a0286b UseSWIG: Add `-dllimport` only if not already specified Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !958
| * | | | UseSWIG: Add `-dllimport` only if not already specifiedRobert Langlois2017-06-141-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SWIG fails with a redefined macro error when `-dllimport` is specified more than once. One case where you would want to specify your own dllimport is when using SWIG with netstandard2.0. .NET Core does not search for shared library like Mono or .NET, so you need a fully qualified shared library name.
* | | | | Merge topic 'ipo-per-lang'Brad King2017-06-155-19/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba247cca IPO: Consider support for each language separately Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !964
| * | | | | IPO: Consider support for each language separatelyBrad King2017-06-145-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only define `INTERPROCEDURAL_OPTIMIZATION` behavior for C, CXX, and Fortran languages. Do not try to enable support for other languages. Furthermore, each language builds with a different compiler, so check for support by CMake and the compiler for each language independently. Fixes: #16944
* | | | | | Merge topic 'android-unified-headers'Brad King2017-06-134-16/+52
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d00be13 Android: Add support for unified headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !956
| * | | | | Android: Add support for unified headersBrad King2017-06-124-16/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unified headers are preferred as of NDK r15, so use them by default if available and provide an option to use the deprecated headers. Inspired-by: Florent Castelli <florent.castelli@gmail.com> Fixes: #16584
* | | | | | Merge topic 'doc-pkgconfig-list'Brad King2017-06-131-1/+7
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70a6cb70 FindPkgConfig: mention that variables will be ;-lists 6610fdbe FindPkgConfig: fix confusing indentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !957
| * | | | | FindPkgConfig: mention that variables will be ;-listsRolf Eike Beer2017-06-121-0/+6
| | | | | |
| * | | | | FindPkgConfig: fix confusing indentationRolf Eike Beer2017-06-121-1/+1
| |/ / / /
| * | | | Merge branch 'android-standalone-no-sysroot-include' into release-3.9Brad King2017-06-091-2/+7
| |\ \ \ \
| * \ \ \ \ Merge branch 'android-standalone-unified-api-level' into release-3.9Brad King2017-06-091-5/+28
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'cuda-dlink-no-deprecated-gpu'Brad King2017-06-132-4/+21
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | 7368ade2 CUDA: When linking device code suppress CUDA 8.0+ deprecation warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !951
| * | | | | CUDA: When linking device code suppress CUDA 8.0+ deprecation warningsRobert Maynard2017-06-132-4/+21
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | The CUDA compiler automatic deprecation warnings are pure noise when doing device linking, and should be suppressed to reduce the amount of confusion from users.
* | | | | Merge topic 'android-standalone-no-sysroot-include'Brad King2017-06-121-2/+7
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 22f8a465 Android: Do not pass sysroot include for standalone toolchain Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !952
| * | | | Android: Do not pass sysroot include for standalone toolchainBrad King2017-06-091-2/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.8.0-rc1~60^2 (Android: Pass sysroot include directory explicitly, 2017-01-20) does not make sense when compiling with a standalone toolchain which is tied to a single API version. Drop the explicit include directory so that the compiler uses its default system include order. Fixes: #16954
* | | | Merge topic 'android-standalone-unified-api-level'Brad King2017-06-121-5/+28
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 5f93bf78 Android: Detect API version of standalone toolchain with unified headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !950
| * | | Android: Detect API version of standalone toolchain with unified headersBrad King2017-06-091-5/+28
| |/ / | | | | | | | | | | | | | | | | | | A standalone toolchain with unified headers keeps the `__ANDROID_API__` macro in the `bin/clang` launcher instead of in `api-level.h`. Issue: #16954
* | | Merge topic 'cpack-freebsd-pkg'Brad King2017-06-122-0/+249
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2042cae9 CPack-FreeBSD: add a generator for FreeBSD pkg(8) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !693
| * | | CPack-FreeBSD: add a generator for FreeBSD pkg(8)Adriaan de Groot2017-06-102-0/+249
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an option CPACK_ENABLE_FREEBSD_PKG to allow CPack to look for FreeBSD's libpkg / pkg(8). If this is set and the libpkg headers and library are found (which they will be, by default, on any FreeBSD system), then add a FreeBSD pkg(8) generator. The FreeBSD package tool pkg(8) uses tar.xz files (.txz) with two metadata files embedded (+MANIFEST and +COMPACT_MANIFEST). This introduces a bunch of FreeBSD-specific CPACK_FREEBSD_PACKAGE_* variables for filling in the metadata; the Debian generator does something similar. Documentation for the CPack CMake-script is styled after the Debian generator. Implementation notes: - Checks for libpkg -- the underlying implementation for pkg(8) -- and includes FreeBSD package-generation if building CMake on a UNIX host. Since libpkg can be used on BSDs, Linux and OSX, this potentially adds one more packaging format. In practice, this will only happen on FreeBSD and DragonflyBSD. - Copy-paste from cmCPackArchiveGenerator to special-case the metadata generation and to run around the internal archive generation: use libpkg instead. - Generating the metadata files is a little contrived. - Most of the validation logic for package settings is in CPackFreeBSD.cmake, as well as the code that tries to re-use packaging settings that may already be set up for Debian. - libpkg has its own notion of output filename, so we have another contrived bit of code that munges the output file list so that CPack can find the output. - Stick with C++98.
* | | FindHTMLHelp: Use PATH_SUFFIXES to search under Program FilesBrad King2017-06-091-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | The find commands already know how to search in variants of the Program Files folders on Windows. Use PATH_SUFFIXES to tell them under what directory within Program Files to find htmlhelp. Fixes: #16950
* | | Merge topic 'sdcc-simplify-link-flags'Brad King2017-06-091-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | a0436a2f SDCC: Remove superfluous whitespace from link line dcf559d0 SDCC: Do not explicitly ask linker to generate Intel Hex files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !942
| * | SDCC: Remove superfluous whitespace from link lineReto Schneider2017-06-081-1/+1
| | |
| * | SDCC: Do not explicitly ask linker to generate Intel Hex filesReto Schneider2017-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | The `--out-fmt-ihx` option added by commit v2.6.0~1253 (...use --out-fmt-ihx to enforce .ihx files, 2007-08-15) may interfere with options requested by the user. Also, when no linker output is specified, SDCC outputs Intel Hex by default anyway.
* | | FindDoxygen: Create imported targets at most once in a given scopeBrad King2017-06-091-16/+24
|/ / | | | | | | | | | | The imported targets added by commit v3.9.0-rc1~55^2 (Improve Doxygen support, 2017-04-10) need to be guarded against duplicate creation on multiple inclusion.
* | FindDoxygen: Restore DOXYGEN_DOT_FOUND variableKonstantin Podsvirov2017-06-071-1/+1
|/ | | | | | The changes in commit v3.9.0-rc1~55^2 (Improve Doxygen support, 2017-04-10) accidentally dropped this variable from its compatibility mode.
* Merge topic 'GoogleTest-disabled-tests'Brad King2017-06-051-8/+38
|\ | | | | | | | | | | | | | | 92bbb706 GoogleTest: Add support for disabled tests Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Craig Scott <craig.scott@crascit.com> Merge-request: !920
| * GoogleTest: Add support for disabled testsChuck Atkins2017-06-051-8/+38
| | | | | | | | Fixes: #10612
* | Merge topic 'add-common-record-features-macros'Brad King2017-06-0112-179/+55
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c1ecb52 Intel: Fix missing C std default for 12.0 <= ver < 12.1 f70b0bb3 SunPro: Make sure all known versions get CXX98 defaults 220ede74 GNU: Fix language defaults for 3.4 a40e6ba8 Clang: Fix language defaults for 2.1 9b112a84 Compilers: Port to use default cmake_record_lang_compile_features macros 37221529 MSVC: Add empty definitions for std compile options e556f1b9 CompileFeatures: Makes tests work with meta-feature only 20ffa147 Tests: Allow test macro to take no executable arguments ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !833
| * | Intel: Fix missing C std default for 12.0 <= ver < 12.1Chuck Atkins2017-05-311-1/+1
| | |
| * | SunPro: Make sure all known versions get CXX98 defaultsChuck Atkins2017-05-311-3/+3
| | |
| * | GNU: Fix language defaults for 3.4Chuck Atkins2017-05-301-1/+1
| | |
| * | Clang: Fix language defaults for 2.1Chuck Atkins2017-05-301-1/+1
| | |
| * | Compilers: Port to use default cmake_record_lang_compile_features macrosChuck Atkins2017-05-3011-171/+2
| | |