summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-nasm'Brad King2017-02-102-2/+23
|\ | | | | | | | | 5ba2c9e5 VS: Add support for ASM_NASM language
| * VS: Add support for ASM_NASM languageEvgeny Fimochkin2017-02-072-2/+23
| | | | | | | | Fixes: #16469
* | Merge topic 'ExtractGTestMacro'Brad King2017-02-102-57/+76
|\ \ | | | | | | | | | | | | 9837ed96 GoogleTest: Add module to contain gtest_add_tests independently
| * | GoogleTest: Add module to contain gtest_add_tests independentlyBradley Lowekamp2017-02-072-57/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract the `gtest_add_tests` macro from `FindGTest` into a separate module. GTest or GoogleTest can be used by a project in a several different ways, including installed libraries in the system, from an ExternalProject, or adding the GTest source directory as a sub directory of the project. As not all of these uses are supported by the FindGTest module the useful `gtest_add_tests` macro is separated to easily enable reuse. Issue: #14151
* | | Merge topic 'gcc-cpp98'Brad King2017-02-101-2/+1
|\ \ \ | | | | | | | | | | | | | | | | e2ee0971 g++ knows about C++98 selection flags since at least 3.4
| * | | g++ knows about C++98 selection flags since at least 3.4Rolf Eike Beer2017-02-081-2/+1
| | | | | | | | | | | | | | | | https://gcc.gnu.org/onlinedocs/gcc-3.4.0/gcc/C-Dialect-Options.html#C-Dialect-Options
* | | | Merge topic 'sphinx-1.4'Brad King2017-02-101-3/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 30abf145 Help: Fix cmake code block warnings produced by Sphinx 1.4 97917900 Utilities/Sphinx: Port qthelp css workaround to Sphinx 1.4 971384c2 Utilities/Sphinx: Port cmake extension to Sphinx 1.4
| * | | Help: Fix cmake code block warnings produced by Sphinx 1.4Brad King2017-02-101-3/+3
| | |/ | |/| | | | | | | | | | | | | | | | Some of our "cmake" code blocks do not use fully valid CMake syntax because they have placeholders for human reference. Sphinx has never been able to properly lex and highlight these, but now warns. Fix each block's syntax or change to a non-cmake block as appropriate.
* | | Merge topic 'determine_id_without_user_specified_flags'Brad King2017-02-072-21/+30
|\ \ \ | | | | | | | | | | | | | | | | 72ed051b CMakeDetermineCompilerId: check with and without user-specified flags
| * | | CMakeDetermineCompilerId: check with and without user-specified flagsMichael Maltese2017-02-062-21/+30
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang may raise an error when passed a `-march=` option that doesn't correspond to the current target triple. CMake cannot pass the target triple when determining the compiler id because it doesn't know how yet, but it does pass along user-specified flags. This breaks when those user-specified flags include `-march=`. Fix this use case by also trying to find the compiler id without the user-specified flags. Fixes: #16587
* | | Merge topic 'FindProtobuf-static-libs'Brad King2017-02-071-0/+27
|\ \ \ | | | | | | | | | | | | | | | | a3f71349 FindProtobuf: Add option to find static libraries on UNIX
| * | | FindProtobuf: Add option to find static libraries on UNIXSébastien GALLOU2017-02-061-0/+27
| | |/ | |/| | | | | | | | | | | | | Add a `Protobuf_USE_STATIC_LIBS` input variable to optionally restrict searches to static library names. This follows the approach of `FindBoost`.
* | | Merge topic 'FeatureSummary_description'Brad King2017-02-071-14/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 28e87033 FeatureSummary: Update release notes 6f62c66b FeatureSummary: Add FeatureSummary_<TYPE>_DESCRIPTION global properties f9bc8cfe FeatureSummary: Add DEFAULT_DESCRIPTION option to feature_summary
| * | | FeatureSummary: Add FeatureSummary_<TYPE>_DESCRIPTION global propertiesDaniele E. Domenichelli2017-02-061-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | The global property FeatureSummary_<TYPE>_DESCRIPTION can be defined for each type to replace the type name with the specified string whenever the package type is used in an output string.
| * | | FeatureSummary: Add DEFAULT_DESCRIPTION option to feature_summaryDaniele E. Domenichelli2017-02-061-14/+32
| |/ / | | | | | | | | | | | | If enabled and only one package type is selected, it will print the default title for the selected package type.
* | | CPackWIX: Introduce new CPACK_WIX_ROOT_FOLDER_ID variableNils Gladitz2017-02-061-0/+11
|/ / | | | | | | | | | | | | | | | | | | The new variable allows specification of a custom root folder ID. The implicit default is "ProgramFiles<64>Folder". The "<64>" token is replaced by "" for 32-bit and "64" for 64-bit builds. Inspired-By: Eric Backus Fixes: #16573
* | FeatureSummary: Fix documentationDaniele E. Domenichelli2017-02-061-8/+10
|/
* Merge topic 'productbuild_signing'Brad King2017-02-061-0/+20
|\ | | | | | | | | 48aad9cd CPackProductBuild: Add options to sign packages
| * CPackProductBuild: Add options to sign packagesRoman Wüger2017-02-041-0/+20
| |
* | Merge topic 'androidtestutilities_cleanup'Brad King2017-02-062-6/+15
|\ \ | | | | | | | | | | | | | | | 8a5cb84b AndroidTestUtilities: do not require ExternalData unconditionally 9d34e51c AndroidTestUtilities: ignore exit status of ls
| * | AndroidTestUtilities: do not require ExternalData unconditionallyZack Galbreath2017-02-041-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempting to use AndroidTestUtilities to simply install some local files on device can result in the following error: Neither ExternalData_URL_TEMPLATES nor ExternalData_OBJECT_STORES is set We no longer require these ExternalData-specific variables to be set if no such remote data files are requested. Fixes: #16529
| * | AndroidTestUtilities: ignore exit status of lsZack Galbreath2017-02-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adb used to suffer from a bug where `adb shell` would return 0 irrespective the exit status of the underlying process that it executed. This is now fixed for newer versions of Android (N+). As a result, attempting to `adb shell ls` a nonexistent file can now result in a non-zero exit status. Updating check_device_file_exists to ignore the exit status of `adb shell` fixes this bug for newer Android devices.
* | | Merge topic 'FindHDF5-fix-HDF5_ROOT'Brad King2017-02-061-83/+102
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf0d8f1f FindHDF5: Restore HDF5_INCLUDE_DIR in all code paths 5564c017 FindHDF5: Restore fallback to static libraries 4908969f FindHDF5: Fix search with HDF5_ROOT 77f6d22a FindHDF5: Use keywords in find_library calls 3d5ad723 FindHDF5: Initialize/finalize internal search options variable ae89967f FindHDF5: Fix command-line parsing argument extraction order
| * | | FindHDF5: Restore HDF5_INCLUDE_DIR in all code pathsBrad King2017-02-031-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This compatibility variable should be set no matter which method was used to find HDF5. Even if `HDF5_INCLUDE_DIRS` was set by copying the `HDF5_INCLUDE_DIR` value from `hdf5-config.cmake` it will not hurt to copy the same value back. Issue: #16566
| * | | FindHDF5: Restore fallback to static librariesBrad King2017-02-031-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.6.1~6^2~2 (FindHDF5: Fix h5cc arg parsing to work with homebrew on Mac, 2016-07-11) we treated `HDF5_USE_STATIC_LIBRARIES` OFF as a requirement for shared libraries. It is just supposed to be a preference. Even if `HDF5_USE_STATIC_LIBRARIES` is not set we should still fall back to finding static libraries if shared libraries are not available. Issue: #16566
| * | | FindHDF5: Fix search with HDF5_ROOTBrad King2017-02-031-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.6.0-rc1~72^2 (HDF5: Rework component searching to correctly find HL for all bindings, 2016-05-12) turned off a large amount of its logic when HDF5_ROOT is set. This caused use of the hdf5 compiler wrapper to extract all needed libraries (e.g. z, dl as dependencies of hdf5 static libraries) to be skipped when using HDF5_ROOT. Fix the search logic to honor HDF5_ROOT in all code paths. Restrict the search for hdf5-specific components to this root, but allow external libraries to be found anywhere. Fixes: #16566
| * | | FindHDF5: Use keywords in find_library callsBrad King2017-02-031-2/+8
| | | | | | | | | | | | | | | | Clarify the purpose of each argument.
| * | | FindHDF5: Initialize/finalize internal search options variableBrad King2017-02-031-7/+11
| | | | | | | | | | | | | | | | While at it, use a more private name.
| * | | FindHDF5: Fix command-line parsing argument extraction orderBrad King2017-02-031-55/+37
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-implement our internal `_HDF5_parse_compile_line` helper to process command line arguments all at once and in order. Otherwise the libraries named by absolute path and those named by `-l` arguments are not kept in order. The new implementation will not handle separate arguments like `-I /path/to/include/dir` but I have not seen the HDF5 compiler wrappers produce this form. If necessary the parsing loop can be extended with a state variable to keep track of such pairs.
* | | Merge topic 'findmpi-flags-fix'Brad King2017-02-061-0/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | a2a73935 FindMPI: Remove leading spaces from flags 93f29be2 FindMPI: Reset MPI_INCLUDE_PATH_WORK before use
| * | FindMPI: Remove leading spaces from flagsChristian Pfeiffer2017-02-021-0/+2
| | |
| * | FindMPI: Reset MPI_INCLUDE_PATH_WORK before useChristian Pfeiffer2017-02-011-0/+2
| | |
* | | GNU C++: record that -fvisibility-inlines-hidden is available since 4.0Rolf Eike Beer2017-02-021-1/+1
| | | | | | | | | | | | See https://gcc.gnu.org/onlinedocs/gcc-4.0.0/gcc/Option-Summary.html
* | | GNU C: record that C99 is available since at least 3.4Rolf Eike Beer2017-02-022-10/+9
| |/ |/|
* | Merge topic 'find_cuda_fix_typo'Brad King2017-02-021-1/+1
|\ \ | | | | | | | | | | | | 645dd3ca FindCUDA: Fix typo in CUDA_DETECT_INSTALLED_GPUS doc string
| * | FindCUDA: Fix typo in CUDA_DETECT_INSTALLED_GPUS doc stringPierre Moreau2017-02-021-1/+1
| | |
* | | Merge topic 'FindGSL-regex-fixup'Brad King2017-02-021-1/+1
|\ \ \ | |/ / |/| | | | | | | | 88c4576b FindGSL: Fix gl_version.h extraction regex
| * | FindGSL: Fix gl_version.h extraction regexIgor Peschinskiy2017-02-011-1/+1
| | | | | | | | | | | | Fix the regex to match versions with only two digits, such as `2.3`.
* | | Merge topic 'WCDH_allow_unsupported'Brad King2017-02-011-79/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1679fecb CompileFeatures Test: make sure the target "CompileFeatures" is always defined 98e6d1e5 Tests/Module/WCDH: make it work with only C features defined c8703e9d WCDH: optionally omit error code for unknown compilers or compiler versions 0de9c398 WCDH: add macro to write simple replacement defines
| * | | WCDH: optionally omit error code for unknown compilers or compiler versionsRolf Eike Beer2017-01-301-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | This allows one to generate a header that will basically always work. In case an unknown compiler or compiler version is encountered it simply falls back to the unsupported case.
| * | | WCDH: add macro to write simple replacement definesRolf Eike Beer2017-01-301-70/+20
| | | |
* | | | Merge topic 'FortranCInterface-vs-intel-workaround'Brad King2017-02-012-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c9ee05d8 FortranCInterface: Fix support for VS with Intel toolset
| * | | | FortranCInterface: Fix support for VS with Intel toolsetBrad King2017-02-012-2/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a Visual Studio generator with an Intel toolset, such as -T "Intel C++ Compiler XE 14.0" the generated FortranCInterface mangling detection project may fail to build due to `devenv` not working with the `/project ALL_BUILD` option. This seems to be a bug in `devenv` or the Intel VS integration. Work around the problem by building with `/project FortranCInterface` instead. We only need to build this executable and its dependencies within the detection test project anyway. Fixes: #16519
* | | | Merge topic 'intel-c11-windows'Brad King2017-02-011-5/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | 5d70894d Features: Update version of Intel Compiler on Windows supporting C 11
| * | | Features: Update version of Intel Compiler on Windows supporting C 11Brad King2017-02-011-5/+8
| |/ / | | | | | | | | | | | | The Intel Compiler 15.0.0 on Windows does not support `-Qstd=c11`. Bump our version requirement to 16 to use that flag.
* | | Merge topic 'CSharpVS2017'Brad King2017-01-311-4/+4
|\ \ \ | | | | | | | | | | | | | | | | 435cebaa VS: Fix CSharp compiler identification for VS 2017
| * | | VS: Fix CSharp compiler identification for VS 2017Gilles Khouzam2017-01-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | The CSharp compiler for VS 2017 has moved from `MSBuildTools` to `RoslynTargets`. Account for both locations giving priority to the `MSBuildTools` location.
* | | | Merge topic 'FindBoost-cache-unset-on-change'Brad King2017-01-311-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | 97d61562 FindBoost: unset cache variables if the lib dir changes
| * | | FindBoost: unset cache variables if the lib dir changesYves Frederix2017-01-301-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced by commit v3.3.0-rc1~5^2~2 (FindBoost: Search for debug and release libraries separately, 2015-01-26). The `_Boost_CHANGE_LIBDIR` variable was split into `_Boost_CHANGE_LIBDIR_{DEBUG,RELEASE}` but one usage site was not updated.
* | | Merge topic 'FeatureSummary_enhancement'Brad King2017-01-301-101/+229
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 560574b0 FeatureSummary: Update release notes 3cfde818 FeatureSummary: Refactor to use global properties for package types f0165eb6 FeatureSummary: Allow lists of dependencies in ADD_FEATURE_INFO 9da7bf08 FeatureSummary: Add QUIET_ON_EMPTY option to feature_summary 4cf4aceb FeatureSummary: Add unit tests 614a97a5 FeatureSummary: Do not force OPTIONAL type in SET_PACKAGE_PROPERTIES 65a0bfd8 FeatureSummary: Add deprecation warnings to deprecated commands 4da3cae9 FeatureSummary: Clean printed output