summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'csproj_add_free_source_tags'Brad King2017-03-021-0/+298
|\ | | | | | | | | | | | | 506207f9 VS: add test for VS_CSHARP_* source file property a202749c VS: add CSharpUtilities module 9588d0a2 VS: add VS_CSHARP_<tagname> sourcefile property
| * VS: add CSharpUtilities moduleMichael Stürmer2017-03-011-0/+298
| |
* | Merge topic 'FindHDF5-updates'Brad King2017-03-021-23/+58
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2186b323 FindHDF5: initialize HDF5_DEFINITIONS when using hdf5-config.cmake 16f1dd0d FindHDF5: document HDF5_<LANG>_DEFINITIONS b2de6da2 FindHDF5: use import libraries when using hdf5-config.cmake on Windows 003c9138 FindHDF5: do not cache library locations when using hdf5-config.cmake bf67fff0 FindHDF5: recognize hdf5:: prefix when using hdf5-config.cmake e629be4a FindHDF5: fix typo in comment 1c7a9119 FindHDF5: remove mark_as_advanced for non-cached variables 8250a520 FindHDF5: add HDF5_FIND_DEBUG variable to get debugging output 4b847f12 FindHDF5: hide HDF5_DIR if HDF5 was found in another way
| * | FindHDF5: initialize HDF5_DEFINITIONS when using hdf5-config.cmakeKris Thielemans2017-03-011-0/+1
| | |
| * | FindHDF5: document HDF5_<LANG>_DEFINITIONSKris Thielemans2017-03-011-1/+5
| | |
| * | FindHDF5: use import libraries when using hdf5-config.cmake on WindowsKris Thielemans2017-03-011-3/+11
| | | | | | | | | | | | | | | | | | | | | The `LOCATION` of imported shared libraries on Windows is that of the `.dll`. Use the import library instead to get the `.lib` to be linked. Fixes: #16534
| * | FindHDF5: do not cache library locations when using hdf5-config.cmakeKris Thielemans2017-03-011-6/+2
| | | | | | | | | | | | | | | The imported targets provide a persistent reference of their location, so we do not need to cache the values.
| * | FindHDF5: recognize hdf5:: prefix when using hdf5-config.cmakeKris Thielemans2017-03-011-6/+10
| | | | | | | | | | | | Some versions of HDF5 use this prefix on their imported targets.
| * | FindHDF5: fix typo in commentKris Thielemans2017-03-011-1/+1
| | |
| * | FindHDF5: remove mark_as_advanced for non-cached variablesKris Thielemans2017-03-011-7/+0
| | |
| * | FindHDF5: add HDF5_FIND_DEBUG variable to get debugging outputKris Thielemans2017-02-281-0/+23
| | |
| * | FindHDF5: hide HDF5_DIR if HDF5 was found in another wayKris Thielemans2017-02-281-0/+6
| | |
* | | Merge topic 'FindPkgConfig-version-ops'Brad King2017-03-011-24/+11
|\ \ \ | | | | | | | | | | | | | | | | 8d71fa92 FindPkgConfig: use new version checking "library >= version" syntax
| * | | FindPkgConfig: use new version checking "library >= version" syntaxGautier Pelloux-Prayer2017-02-281-24/+11
| |/ / | | | | | | | | | Instead of the deprecated --atleast-version one.
* | | ExternalProject: only append `COMMAND` if actually adding a commandBen Boeckel2017-02-271-3/+2
|/ / | | | | | | Fixes #16544.
* | Merge topic 'ExternalProject-checkout-clarify'Brad King2017-02-271-1/+1
|\ \ | | | | | | | | | | | | a9fa6a2c ExternalProject: Run `git checkout` with `--` to clarify arguments
| * | ExternalProject: Run `git checkout` with `--` to clarify argumentsBrad King2017-02-241-1/+1
| |/ | | | | | | | | | | | | Fix the case when the tag name to be checked out also happens to match a path name. Fixes: #16678
* | Merge topic 'GetPrerequisites-find_item_basename'Brad King2017-02-241-0/+5
|\ \ | | | | | | | | | | | | eacf7dec GetPrerequisites: also try to resolve just the basename
| * | GetPrerequisites: also try to resolve just the basenameMichael Maltese2017-02-221-0/+5
| | | | | | | | | | | | Fixes #16625.
* | | Merge topic 'find_openmp_clang_patch'Brad King2017-02-241-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 9dc7a2ed FindOpenMP: Add iomp5 variant of Clang OpenMP flags
| * | | FindOpenMP: Add iomp5 variant of Clang OpenMP flagsLucas Czech2017-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Try `-fopenmp=libiomp5` in addition to `-fopenmp=libomp`. Leave the latter as the default that we try first when the compiler id is `Clang`. If that does not work we will still fall back to trying all the candidates and eventually get to the iomp5 variant.
* | | | Merge topic 'autogen_depends'Brad King2017-02-241-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62a1e292 Autogen: Add hint to SKIP_AUTOMOC in error message e98465cf Autogen: Add Quote function and use it for logging 96f6f392 Autogen: Add AUTOMOC_DEPEND_FILTERS documentation 94e3f82c Autogen: Add AUTOMOC_DEPEND_FILTERS test 70ebf35c Autogen: Add AUTOMOC_DEPEND_FILTERS support 2a6fd432 Autogen: Single point of return in Run() method e9a8a207 Autogen: Log simplifications
| * | | Autogen: Add AUTOMOC_DEPEND_FILTERS supportSebastian Holtermann2017-02-221-0/+1
| | | |
* | | | Merge topic 'FindCUDA-fix-init'Brad King2017-02-231-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | 934eb497 FindCUDA: Fix PTX selection with multiple architectures
| * | | FindCUDA: Fix PTX selection with multiple architecturesBjoern Thiel2017-02-221-0/+1
| | |/ | |/|
* | | Merge topic 'autogen_json'Brad King2017-02-221-15/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29d96633 Autogen: Don't use .moc include in Q_PLUGIN_METADATA test d60f1ddc Autogen: Documentation update cdb72127 Autogen: Add release notes for Q_PLUGIN_METADATA support 8b13a52c Autogen: Tests: Set different compression levels in rcc test 9d1db7d7 Autogen: Overhaul and simplify AutogenInfo.cmake file generation 0ab817fa Autogen: Optimize GetCompileDefinitionsAndDirectories function 754d4318 Autogen: Sort AutogenInfo.cmake.in cd74daf0 Autogen: Tests: Add Q_PLUGIN_METADATA test 39c4819e Autogen: Tests: Add moc include tests 50805693 Autogen: Tests: Clean comments c23206b6 Autogen: Log simplifications 347572cf Autogen: Only touch an unchanged moc_compilation.cpp 03df033b Autogen: Rebuild moc when Q_PLUGIN_METADATA json file changes 3ec230de Autogen: Use GetRealPath in central places only 41fb64e7 Autogen: Search moc includes in include directories 175c8900 Autogen: Sort includes before composing include options ...
| * | | Autogen: Overhaul and simplify AutogenInfo.cmake file generationSebastian Holtermann2017-02-211-6/+6
| | | |
| * | | Autogen: Sort AutogenInfo.cmake.inSebastian Holtermann2017-02-211-14/+20
| | | | | | | | | | | | | | | | | | | | Also rename AM_SKIP_MOC to AM_MOC_SKIP and AM_SKIP_UIC to AM_UIC_SKIP
* | | | Merge topic 'ExternalProject-update-docs'Brad King2017-02-221-2/+9
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | c95d017f ExternalProject: Clarify documented role of `INSTALL_DIR` 4b21290e ExternalProject: Clarify documented role of `INSTALL_COMMAND`
| * | | ExternalProject: Clarify documented role of `INSTALL_DIR`Brad King2017-02-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | It does not actually configure the project to install to the given location. That must be done by passing the `<INSTALL_DIR>` placeholder to the external project configuration step.
| * | | ExternalProject: Clarify documented role of `INSTALL_COMMAND`Wilfried Goesgens2017-02-211-1/+5
| | |/ | |/| | | | | | | | | | It is for the install step of the external project and does not affect installation of the calling project.
* | | 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++.