summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindPkgConfig-rerun'Brad King2017-07-111-1/+3
|\ | | | | | | | | | | | | 3cf267cf FindPkgConfig: do not always rerun pkg_check_modules() with 2 arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1036
| * FindPkgConfig: do not always rerun pkg_check_modules() with 2 argumentsRolf Eike Beer2017-07-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.8.0-rc1~47^2 (FindPkgConfig: Recheck pkg-config on parameter change, 2017-01-17) calling `pkg_check_modules` always re-runs. The problem is that if there are only 2 arguments passed to `pkg_check_modules```, then `_module0` will be set and `ARGN` will be empty. When this is written to cache it will be stored as just the value of `_module0` without any semicolon, so on the next run this doesn't match the expected value and the search is rerun. Revise the logic to handle the case of empty `ARGN` separately. Fixes: #17003
* | Merge topic 'FindHDF5-windows'Brad King2017-07-111-15/+27
|\ \ | |/ |/| | | | | | | | | | | 6848ff4c FindHDF5: Define H5_BUILT_AS_DYNAMIC_LIB when using Windows DLLs 6f131f49 FindHDF5: Add support for HDF5_USE_STATIC_LIBRARIES on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1023
| * FindHDF5: Define H5_BUILT_AS_DYNAMIC_LIB when using Windows DLLsKris Thielemans2017-07-071-0/+4
| | | | | | | | | | | | When searching for shared libraries on Windows, add H5_BUILT_AS_DYNAMIC_LIB to HDF5_DEFINITIONS so that the header file knows how to dllimport the symbols.
| * FindHDF5: Add support for HDF5_USE_STATIC_LIBRARIES on WindowsKris Thielemans2017-07-071-15/+23
| | | | | | | | Also add the `_D` suffix for debug libraries.
* | Merge topic 'iar_improved'Brad King2017-07-0716-89/+295
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8e6cd9e IAR: Improve support for IAR ARM Compiler 0b1a2876 Add a CMAKE_<LANG>_COMPILER_ARCHITECTURE_ID variable fea7d69d Store CMAKE_ASM_COMPILER_VERSION persistently d2a8b5ce CMakeDetermineASMCompiler: Fix small copy-paste mistake a2112257 Add infrastructure to use language extensions without any standard 8cd28bb0 cmLocalGenerator: Switch order of <LANG>_{EXTENSIONS,STANDARD} check 0fc2d78e cmLocalGenerator: Simplify logic for language standard or extension flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !991
| * | IAR: Improve support for IAR ARM CompilerNorbert Lange2017-06-2910-75/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the implementation for this compiler more complete. IAR has multiple C++ modes, historically they were reduced c++ versions for embedded that gradually improved to the full standard (which can be reduced again by e.g. disabling rtti and exceptions). The new implementation picks the best available, but the c++ mode can also be overridden by defining `CMAKE_IAR_CXX_FLAG`. Add C/C++ standard flags so that all modes up to and including the last supported standard are defined. Fixes: #16826
| * | Add a CMAKE_<LANG>_COMPILER_ARCHITECTURE_ID variableNorbert Lange2017-06-299-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compilers such as MSVC and IAR may have variants that target different architectures. We have been using a `MSVC_<LANG>_ARCHITECTURE_ID` variable to hold this information for MSVC. Add an alternative with a more general name (later we can port MSVC to it too). This additional information may be needed to generate proper invocations of the compiler based on its architecture variant.
| * | Store CMAKE_ASM_COMPILER_VERSION persistentlyNorbert Lange2017-06-292-13/+31
| | | | | | | | | | | | We already do this for other languages like C and CXX.
| * | CMakeDetermineASMCompiler: Fix small copy-paste mistakeNorbert Lange2017-06-291-1/+1
| | | | | | | | | | | | GNU is not a vendor of IAR.
* | | Merge topic 'FindDoxygen-create-output-dir'Brad King2017-07-071-3/+11
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 796b8fcb FindDoxygen: Create DOXYGEN_OUTPUT_DIRECTORY if it doesn't exist Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Craig Scott <craig.scott@crascit.com> Merge-request: !1019
| * | FindDoxygen: Create DOXYGEN_OUTPUT_DIRECTORY if it doesn't existRobert Dailey2017-07-061-3/+11
| | | | | | | | | | | | | | | If the doxygen output directory does not exist, create it prior to running the doxygen commands.
* | | Merge topic 'FindDoxygen-project-in-subdir'Brad King2017-06-301-5/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | 97a9a356 FindDoxygen: Use a stable reference to the location of global resources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1014
| * | FindDoxygen: Use a stable reference to the location of global resourcesRobert Dailey2017-06-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindDoxygen generates some files based on the version of Doxygen whose content will not vary across a project and are therefore a global resource that can be shared by all calls to `find_package(Doxygen)` and to `doxygen_add_docs`. We currently use `${PROJECT_BINARY_DIR}` to reference their location, but this is not stable because `project()` calls in a subdirectory can change it. Use `${CMAKE_BINARY_DIR}` instead. Reviewed-by: Craig Scott <craig.scott@crascit.com> Fixes: #17022
| * | Merge branch 'FindDoxygen-internal-var' into release-3.9Brad King2017-06-271-6/+6
| |\ \
| * \ \ Merge branch 'GetPrerequisites-ucrt-no-warn' into release-3.9Brad King2017-06-261-1/+1
| |\ \ \
* | \ \ \ Merge topic '16961-xctest-scheme'Brad King2017-06-291-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe34a5c8 Xcode: Add XCTest support to schema generator 690cf2c1 Xcode: Prepare schema generator for XCTest ff3498e7 XCTest: Speed up test by only enabling C language 610d2fce XCTest: Use bundle specific generator expressions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1013
| * | | | | XCTest: Use bundle specific generator expressionsGregor Jasny2017-06-281-2/+2
| | | | | |
* | | | | | Merge topic 'deb-on-windows'Brad King2017-06-291-4/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52991413 CPackDeb: Enable the DEB generator on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !979
| * | | | | CPackDeb: Enable the DEB generator on WindowsNils Gladitz2017-06-281-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While some features require external Unix tools the generator is mostly portable. By enabling it on Windows it can be used for cross platform packaging.
* | | | | | Merge topic 'clang-cl-no-std'Brad King2017-06-282-29/+61
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c67bb5ba Clang: Do not add '-std=' options when simulating MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !982
| * | | | | | Clang: Do not add '-std=' options when simulating MSVCRuben Van Boxem2017-06-272-29/+61
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `cl.exe` style command line does not accept the `-std=` options. Instead behave like MSVC where we don't define standard levels. Fixes: #16266
* | | | | | Merge topic 'docs_CheckXXXSourceYYY'Brad King2017-06-285-129/+298
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63fc3bff Check*Source{Compiles,Runs}: Rewrite docs for these modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1005
| * | | | | | Check*Source{Compiles,Runs}: Rewrite docs for these modulesCraig Scott2017-06-245-129/+298
| | |_|_|_|/ | |/| | | |
* | | | | | Merge topic 'FindDoxygen-internal-var'Brad King2017-06-271-6/+6
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | d194bd91 FindDoxygen: Add private prefix to internal variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1012
| * | | | | FindDoxygen: Add private prefix to internal variablesBrad King2017-06-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~55^2 (Improve Doxygen support, 2017-04-10) we accidentally leave a non-prefixed internal `result` variable set. This may interfere with project code. Add a prefix to avoid this.
* | | | | | Merge topic 'FindCUDA-no-empty-genex'Brad King2017-06-271-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3e442bb FindCUDA: Fix CUDA_NVCC_FLAGS_<CONFIG> for separable compilation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1008
| * | | | | | FindCUDA: Fix CUDA_NVCC_FLAGS_<CONFIG> for separable compilationRobert Maynard2017-06-261-0/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.0.0-rc6~3^2 (FindCUDA: Use CUDA_NVCC_FLAGS* for separable compilation, 2014-05-18), using the feature for one configuration results in empty-string ("") arguments on the command line for other configurations. This is because the generator expression for a non-matching configuration evaluates to an empty string but does not remove the argument. Use `COMMAND_EXPAND_LISTS` to remove the empty arguments from the custom command after genex evaluation. Fixes: #16411
* | | | | | FindCUDA: Use find_program if find_host_program is not availableMaxime Roussin-Bélanger2017-06-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake does not define the `find_host_program` command we've been using in the cross-compiling code path. It was provided by a widely used Android toolchain file. For compatibility, continue to use `find_host_program` if available, but otherwise use just `find_program`. Fixes: #16509
* | | | | | Merge topic 'toolchain-binutils-advanced'Brad King2017-06-262-0/+4
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 04b2fc08 GCC,Clang: Mark CMAKE_<LANG>_COMPILER_{AR,RANLIB} as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1001
| * | | | | GCC,Clang: Mark CMAKE_<LANG>_COMPILER_{AR,RANLIB} as advancedBrad King2017-06-222-0/+4
| | | | | |
* | | | | | Merge topic 'GetPrerequisites-ucrt-no-warn'Brad King2017-06-261-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | 23451a66 GetPrerequisites: Do not warn about non-absolute UCRT system libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !999
| * | | | GetPrerequisites: Do not warn about non-absolute UCRT system librariesBrad King2017-06-261-1/+1
| |/ / / | | | | | | | | | | | | Issue: #17007
| * | | Merge branch 'android-unified-headers' into release-3.9Brad King2017-06-221-2/+6
| |\ \ \
| * \ \ \ Merge branch 'ipo-per-lang' into release-3.9Brad King2017-06-145-19/+21
| |\ \ \ \
* | \ \ \ \ 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
| |\ \ \ \ \