summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* GetPrerequisites: also try to resolve just the basenameMichael Maltese2017-02-221-0/+5
| | | | Fixes #16625.
* Merge topic 'cmake-host-system-name'Brad King2017-02-211-6/+4
|\ | | | | | | | | | | 717e1f30 Use looked up uname path for command execution 0bbd993f Make CMAKE_HOST_SYSTEM_NAME available in scripting context
| * Use looked up uname path for command executionGregor Jasny2017-02-191-4/+4
| |
| * Make CMAKE_HOST_SYSTEM_NAME available in scripting contextGregor Jasny2017-02-191-2/+0
| |
* | Merge topic 'FindGTK2-old-sigc++'Brad King2017-02-211-1/+4
|\ \ | | | | | | | | | | | | 2ab118a8 FindGTK2: handle old libsigc++ versions
| * | FindGTK2: handle old libsigc++ versionsBen Boeckel2017-02-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Old versions of `libsigc++` do not have the version macros inside of its `sigc++config.h` header. Assume nothing about such headers and report version "zero". Fixes: #16654
* | | Merge topic 'productbuild_component_plist'Brad King2017-02-201-2/+9
|\ \ \ | | | | | | | | | | | | | | | | d32f9deb CPack: Add option to specify --component-plist for productbuild
| * | | CPack: Add option to specify --component-plist for productbuildTim Hutt2017-02-171-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the productbuild generator this lets you specify the value of the `--component-plist` parameter when it runs pkgbuild for a component. Fixes: #16638
* | | | Merge topic 'productbuild_resources'Brad King2017-02-201-0/+8
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | 734581f4 CPack: Add support for CPACK_PRODUCTBULID_RESOURCES_DIR
| * | | CPack: Add support for CPACK_PRODUCTBULID_RESOURCES_DIRTim Hutt2017-02-171-0/+8
| |/ / | | | | | | | | | | | | | | | | | | This allows you to copy custom files (e.g. a background image) into the macOS installer. Fixes: #16604
* | | Merge topic 'FindHDF5-fix-header-langs'Brad King2017-02-171-2/+2
|\ \ \ | | | | | | | | | | | | | | | | 96d61393 FindHDF5: Fix search for language-specific header file
| * | | FindHDF5: Fix search for language-specific header fileBrad King2017-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.6.0-rc1~85^2 (HDF5: Refactor the use of compiler wrappers, 2016-04-04) converted code of the form if(${LANGUAGE} MATCHES ...) to if(LANGUAGE MATCHES ...) However, `LANGUAGE` is a foreach() loop variable and not a normal variable so auto-dereference does not occur. Restore the explicit `${}` syntax and use the new name of the loop variable that has changed since then too. Fixes: #16651
* | | | Merge topic 'FindHDF5-include-dir-advanced'Brad King2017-02-171-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | 28bb68e3 FindHDF5: Restore HDF5_<LANG>_INCLUDE_DIR advanced cache entry mark
| * | | FindHDF5: Restore HDF5_<LANG>_INCLUDE_DIR advanced cache entry markBrad King2017-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.6.0-rc1~72^2 (HDF5: Rework component searching to correctly find HL for all bindings, 2016-05-12) renamed the language loop variable used to construct the name of `HDF5_<LANG>_INCLUDE_DIR` but forgot to update it in the `mark_as_advanced` call. Fix it now. Issue: #16651
* | | | Merge topic 'FindOpenSSL-crypto-name'Brad King2017-02-171-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 9b78dca3 FindOpenSSL: Add another name for libcrypto with MSVC
| * | | | FindOpenSSL: Add another name for libcrypto with MSVCKevin Whitaker2017-02-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Add the `crypto` name without any prefix or suffix as a fallback, just as we already have for `ssl`.
* | | | | Merge topic 'TestBigEndian-cxx-only'Brad King2017-02-161-7/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ac0962ce TestBigEndian: Fix to work with CXX without C
| * | | | | TestBigEndian: Fix to work with CXX without CUwe Koloska2017-02-151-7/+19
| |/ / / /
* | | | | Merge topic 'cuda-msvc-flags'Brad King2017-02-162-11/+12
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | 55fb46d2 CUDA: Fix default compiler flags on Windows d7c80f60 CUDA: Fix test cases to not override CUDA flags
| * | | CUDA: Fix default compiler flags on WindowsBrad King2017-02-152-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the default values of `CMAKE_CUDA_FLAGS[_<CONFIG>]` on Windows to make the host compiler flags match those produced for C++ by the `Platform/Windows-MSVC` module. This makes the flags consistent with those used for C++.
| * | | Merge branch 'cuda-no-Os' into releaseBrad King2017-02-141-1/+1
| |\ \ \
| * \ \ \ Merge branch 'cuda-with-c' into releaseBrad King2017-02-142-0/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'backport-clang-format-cuda' into releaseBrad King2017-02-141-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cmake_provide_include_dir_for_toolkit' into releaseBrad King2017-02-132-4/+32
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge topic 'cuda-drop-comment'Brad King2017-02-151-7/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c29a0c8 CMakeDetermineCUDACompiler: Drop out-of-date comment
| * | | | | | | CMakeDetermineCUDACompiler: Drop out-of-date commentBrad King2017-02-141-7/+0
| | | | | | | |
* | | | | | | | Merge topic 'cuda-with-c'Brad King2017-02-152-0/+8
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c60231c CUDA: Link to standard system libraries when linking as CUDA 8d75d8dc Tests: Add case for CUDA with C but not C++
| * | | | | | | CUDA: Link to standard system libraries when linking as CUDABrad King2017-02-142-0/+8
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows with MSVC-like host compilers we must honor the standard libraries chosen by the `Platform/Windows-MSVC` module. Otherwise C code linked into the CUDA binary that expects to have these libraries available may not link.
* | | | | | | Merge topic 'cuda-no-Os'Brad King2017-02-151-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | / / | | |_|_|/ / | |/| | | | 59ed323d CUDA: Do not use non-existent -Os flag for nvcc
| * | | | | CUDA: Do not use non-existent -Os flag for nvccBrad King2017-02-141-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Fix the CUDA MinSizeRel configuration flags to avoid using the `-Os` flag that nvcc does not support.
| * | | | Merge branch 'sphinx-1.4' into releaseBrad King2017-02-101-3/+3
| |\ \ \ \
* | \ \ \ \ Merge branch 'backport-clang-format-cuda' into clang-format-cudaBrad King2017-02-141-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Modules: Run clang-format on CUDA codeBrad King2017-02-141-1/+1
| | |_|/ / | |/| | |
* | | | | Merge topic 'cmake_provide_include_dir_for_toolkit'Brad King2017-02-142-4/+32
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | 44f3acb2 CUDA: Detect the toolkit include directories
| * | | CUDA: Detect the toolkit include directoriesRobert Maynard2017-02-102-4/+32
| |/ / | | | | | | | | | | | | The `nvcc -v` output provides what include directories need to be added to use the CUDA toolkit from other languages ( C/C++ ).
* | | 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.