summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Fix typos.Felix Geyer2016-07-102-2/+2
|
* ExternalProject: Use default file name if extracting from URL failsRuslan Baratov2016-07-071-1/+6
| | | | | | The download/extract step uses the file name only internally so we can just use a fallback default name if one cannot be extracted from the URL.
* Merge topic 'toolchain-flag-init'Brad King2016-07-0744-172/+229
|\ | | | | | | | | | | | | | | a66004be Honor CMAKE_<LANG>_FLAGS[_<CONFIG>]_INIT set in toolchain files cdde77e5 OpenWatcom: Partially modernize platform information modules f9dbe22c Intel: Do not use GNU-like flags on Windows 5a3ed0d7 Intel: Do not use MSVC-like flags for Fortran
| * Honor CMAKE_<LANG>_FLAGS[_<CONFIG>]_INIT set in toolchain filesBrad King2016-07-0636-149/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document these variables. Change our convention for setting these variables from: set(CMAKE_C_FLAGS_INIT "...") to string(APPEND CMAKE_C_FLAGS_INIT " ...") so that any value previously set by a toolchain file will be used. Automate the conversion with: sed -i 's/set *(\(CMAKE_\(C\|CXX\|Fortran\|RC\|ASM\|${[^}]\+}\)_FLAGS\(_[^_]\+\)\?_INIT \+"\)/string(APPEND \1 /' \ Modules/Compiler/*.cmake Modules/Platform/*.cmake and follow up with some manual fixes (e.g. to cases that already meant to append). Also revert the automated changes to contexts that are not protected from running multiple times.
| * OpenWatcom: Partially modernize platform information modulesBrad King2016-07-065-0/+24
| | | | | | | | | | | | | | Migrate from the old `<os>-<cc>.cmake` layout to the modern `<os>-<id>-<lang>.cmake` layout. Keep settings common to C and C++ in a `Windows-OpenWatcom.cmake` helper module with an include blocker. For now just add both C and CXX settings in the helper module.
| * Intel: Do not use GNU-like flags on WindowsBrad King2016-07-055-24/+54
| | | | | | | | | | | | | | | | | | | | | | Refactor options out of `Modules/Compiler/Intel-{ASM,C,CXX,Fortran}.cmake` into a common helper in `Modules/Compiler/Intel.cmake`. Condition them to be used only on non-Windows hosts where the Intel compiler is GNU-like instead of MSVC-like. Previously this worked only because the options were later overridden by `Modules/Platform/Windows-Intel*.cmake`, but it is cleaner to not set the options in the first place.
| * Intel: Do not use MSVC-like flags for FortranBrad King2016-07-051-14/+17
| | | | | | | | | | | | | | | | | | | | | | Teach `Modules/Platform/Windows-MSVC.cmake` not to use MSVC options for Fortran. We use the `__windows_compiler_msvc` for the Intel Fortran compiler on Windows for other settings, but we do not want the flags. Previously this worked only because the options were later overridden by `Modules/Platform/Windows-Intel*.cmake`, but it is cleaner to not set the options in the first place.
* | Merge topic 'ExternalProject-more-url-filenames'Brad King2016-07-061-7/+5
|\ \ | | | | | | | | | | | | 57c337e2 ExternalProject: Match filenames in URLs with query strings and anchors
| * | ExternalProject: Match filenames in URLs with query strings and anchorsBrad King2016-07-051-7/+5
| |/ | | | | | | | | | | | | While at it, refactor logic to consolidate the filename extraction and verification into a single match. Inspired-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
* | Merge topic 'FindJNI-cleanup'Brad King2016-07-061-2/+5
|\ \ | | | | | | | | | | | | 4e11c966 FindJNI: Improve formatting of FPHSA call
| * | FindJNI: Improve formatting of FPHSA callO Libre2016-07-051-2/+5
| |/ | | | | | | Pass one argument per line for better readability.
* | Merge topic 'FindJNI-ubuntu-paths'Brad King2016-07-061-3/+4
|\ \ | | | | | | | | | | | | 26d16380 FindJNI: Fix support for Ubuntu 15.10
| * | FindJNI: Fix support for Ubuntu 15.10O Libre2016-07-051-3/+4
| | | | | | | | | | | | | | | The library search paths added by commit v3.6.0-rc1~281^2~1 (FindJNI: Add support for Ubuntu 15.10, 2016-03-08) were incorrect. Fix them.
* | | Merge topic 'FindJava-doc-update'Brad King2016-07-061-2/+1
|\ \ \ | | | | | | | | | | | | | | | | 10a7459a FindJava: Do not document variables we do not provide
| * | | FindJava: Do not document variables we do not provideBrad King2016-07-051-2/+1
| | |/ | |/| | | | | | | | | | | | | Drop Java_INCLUDE_DIRS and Java_LIBRARIES from the documentation since we do not provide them. Also add a link to FindJNI to help users find it. Fixes #16180.
* | | Merge topic 'FindBoost-extras'Brad King2016-07-061-0/+4
|\ \ \ | | | | | | | | | | | | | | | | cb1a434c FindBoost: Add check headers for `zlib` and `bzip2`
| * | | FindBoost: Add check headers for `zlib` and `bzip2`Alex Turbov2016-07-051-0/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The official Windows builds of Boost have internal implementations for `zlib` and `bzip2` libraries used by Boost::iostreams library, e.g. * boost_bzip2-vc140-mt-1_59.lib * boost_zlib-vc140-mt-1_59.lib Add check headers for these so that users can specify them as components without any warnings. Reviewed-by: Roger Leigh <rleigh@dundee.ac.uk>
* | | Merge topic 'cpack-rpm-better-directive-match'Brad King2016-07-061-2/+2
|\ \ \ | | | | | | | | | | | | | | | | a351edd2 CPackRPM: Handle directives of form %foo and %foo(anything)
| * | | CPackRPM: Handle directives of form %foo and %foo(anything)Andrew Fuller2016-07-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Directives that are legal inside the %files section of an RPM spec may contain a variety of characters particularly when specifying %caps which can include +, _, and space. Watch for parenthesis to determine what forms the prefix vs. path. Fixes #14362.
* | | | Merge topic 'cpack-ifw-list-variable'Brad King2016-07-062-2/+16
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | 9e505285 CPackIFW: Using cpack_append_list_variable_set_command cd1415b5 CPackComponents: add cpack_append_list_variable_set_command
| * | | CPackIFW: Using cpack_append_list_variable_set_commandKonstantin Podsvirov2016-06-291-2/+2
| | | | | | | | | | | | | | | | This is necessary for proper processing of the list items.
| * | | CPackComponents: add cpack_append_list_variable_set_commandKonstantin Podsvirov2016-06-291-0/+14
| | | | | | | | | | | | | | | | | | | | It's like add variable, but wrap each item to quotes. Can be used for multi args properties.
* | | | Strip CMAKE_<LANG>_FLAGS[_<CONFIG>] initializer whitespaceBrad King2016-07-015-18/+22
| | | |
* | | | Merge topic 'doc-updates'Brad King2016-07-011-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | c05d240e Help: Document CMAKE_TRY_COMPILE_PLATFORM_VARIABLES example dab3ccf2 InstallRequiredSystemLibraries: Document UCRT option use case
| * | | | InstallRequiredSystemLibraries: Document UCRT option use caseBrad King2016-06-301-2/+2
| | |_|/ | |/| | | | | | | | | | Suggested-by: Hendrik Sattler <post@hendrik-sattler.de>
| * | | Merge branch 'FindHDF5-handle-unsuffixed' into releaseBrad King2016-06-271-4/+21
| |\ \ \
| * | | | GetPrerequisites: fix typo in commentRolf Eike Beer2016-06-221-1/+1
| | | | |
* | | | | GenerateExportHeader: Add option to specify custom contentBrad King2016-06-282-4/+15
| |_|/ / |/| | |
* | | | Merge topic 'FindHDF5-handle-unsuffixed'Brad King2016-06-281-4/+21
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 234deec2 FindHDF5: create all the *_LIBRARIES when using hdf5-config.cmake 963b576f FindHDF5: cache the correct path to the high level libraries 9f2728ce FindHDF5: When component targets not found fallback to compiler wrappers 149539d9 FindHDF5: Handle HDF5 builds with non-suffixed components f30b0fec FindHDF5: correctly add lang to each component target name.
| * | | FindHDF5: create all the *_LIBRARIES when using hdf5-config.cmakeRobert Maynard2016-06-241-0/+4
| | | |
| * | | FindHDF5: cache the correct path to the high level librariesRobert Maynard2016-06-241-3/+3
| | | |
| * | | FindHDF5: When component targets not found fallback to compiler wrappersRobert Maynard2016-06-231-0/+6
| | | |
| * | | FindHDF5: Handle HDF5 builds with non-suffixed componentsRobert Maynard2016-06-231-0/+7
| | | |
| * | | FindHDF5: correctly add lang to each component target name.Robert Maynard2016-06-231-1/+1
| |/ /
| * | Merge branch 'pkgconfig-targets' into releaseBrad King2016-06-201-2/+6
| |\ \
| * \ \ Merge branch 'FindQt4-doc-QtDeclarative-imported' into releaseBrad King2016-06-201-0/+2
| |\ \ \
| * \ \ \ Merge branch 'revert-vs-clang-minsize' into releaseBrad King2016-06-171-1/+1
| |\ \ \ \
* | \ \ \ \ Merge topic 'ios-universal-fixes'Brad King2016-06-271-2/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11c3a8dc CMakeIOSInstallCombined: add some sanity checks aff1e77f CMakeIOSInstallCombined: do not merge content of OUTPUT and ERROR variables
| * | | | | | CMakeIOSInstallCombined: add some sanity checksRuslan Baratov2016-06-251-0/+7
| | | | | | |
| * | | | | | CMakeIOSInstallCombined: do not merge content of OUTPUT and ERROR variablesRuslan Baratov2016-06-251-2/+5
| | |_|_|_|/ | |/| | | |
* | | | | | GetPrerequisites: fix typo in commentRolf Eike Beer2016-06-231-1/+1
|/ / / / /
* | | | | Merge topic 'FindZLIB-fixup'Brad King2016-06-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4bb83514 FindZLIB: Do not mark unused variable as advanced
| * | | | | FindZLIB: Do not mark unused variable as advancedBrad King2016-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer define the ZLIB_LIBRARY cache entry, so we should not mark it as advanced either. We only use this variable when someone else defines it in order to remain compatible with older versions of this module, but we never create the entry ourselves anymore.
* | | | | | Merge topic 'GetPrerequisites-findstr'Brad King2016-06-221-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 867b73e2 GetPrerequisites: Optimize on Windows by filtering `objdump` output
| * | | | | | GetPrerequisites: Optimize on Windows by filtering `objdump` outputLaurent Tarrisse2016-06-211-1/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the optimization from commit v3.4.0-rc1~264^2 (GetPrerequisites: Optionally filter "objdump" output for speed, 2015-07-29) to work on Windows by using `findstr` in place of `grep`.
* | | | | | Merge topic '14068-ctest-target-set-buildname-with-only-c-compiler'Brad King2016-06-211-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6509ad29 CTest: Properly set buildname if only C langage is enabled
| * | | | | | CTest: Properly set buildname if only C langage is enabledJean-Christophe Fillion-Robin2016-06-201-6/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | Fixes #14068
* | | | | | Merge topic 'FindGLEW-debug'Brad King2016-06-211-9/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6087b9e4 FindGLEW: Search for debug and release configurations separately
| * | | | | | FindGLEW: Search for debug and release configurations separatelyFARBOS Arnaud2016-06-201-9/+34
| |/ / / / /
* | | | | | Merge topic 'FindLua-match-header-and-lib'Brad King2016-06-211-45/+72
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eecd307e FindLua: Iterate through all include subdirs to find a suitable header 3532cbce FindLua: Check header file against suitable versions 281c707b FindLua: Factor out a helper function for version extraction 92c67b9f FindLua: Prefix private APIs with `_lua_`
generated by cgit v0.12 at 2024-11-12 02:37:20 (GMT)