summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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_`
| * | | | | | FindLua: Iterate through all include subdirs to find a suitable headerIvan Ivanov2016-06-201-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #15756.
| * | | | | | FindLua: Check header file against suitable versionsIvan Ivanov2016-06-201-5/+12
| | | | | | |
| * | | | | | FindLua: Factor out a helper function for version extractionIvan Ivanov2016-06-201-23/+30
| | | | | | |
| * | | | | | FindLua: Prefix private APIs with `_lua_`Ivan Ivanov2016-06-201-8/+8
| |/ / / / /
* | | | | | Merge topic 'FindBoost-imported-fallback-to-release'Brad King2016-06-211-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9fca42f FindBoost: Make imported targets fall back to `Release`
| * | | | | | FindBoost: Make imported targets fall back to `Release`Andreas Weis2016-06-201-7/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindBoost only detects Debug and Release configurations. All other configurations will fall back to the configuration listed as the first entry in `IMPORTED_CONFIGURATIONS`. Switch the order so that `Release` is listed first, as this is a better fallback than `Debug` for the `RelWithDebInfo` and `MinSizeRel` configurations. See issue #16091.
* | | | | | Merge topic 'aix-clang'Brad King2016-06-212-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | 5cc34162 AIX: Add support for Clang compiler
| * | | | | AIX: Add support for Clang compilerWu Zhao2016-06-202-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The platform information module for GNU on AIX can be reused for Clang on AIX because clang accepts almost all of the same options.
* | | | | | Merge topic 'FindQt4-doc-QtDeclarative-imported'Brad King2016-06-201-0/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | 5ed2881c FindQt4: Document Qt4::QtDeclarative imported target (#16157)
| * | | | | FindQt4: Document Qt4::QtDeclarative imported target (#16157)Brad King2016-06-201-0/+2
| | |/ / / | |/| | |
* | | | | Merge topic 'pkgconfig-targets'Brad King2016-06-201-2/+6
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | 8345c646 FindPkgConfig: define the imported targets also when the data comes from cache
| * | | | FindPkgConfig: define the imported targets also when the data comes from cacheRolf Eike Beer2016-06-191-2/+6
| |/ / /
| * | | Merge branch 'SunOS-PathScale' into releaseBrad King2016-06-064-0/+37
| |\ \ \
| * \ \ \ Merge branch 'FindLibArchive-3.2' into releaseBrad King2016-06-031-4/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'FindHDF5-fix-already-found' into releasev3.6.0-rc1Brad King2016-06-021-4/+11
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'FindFreetype-debug-lib'Brad King2016-06-201-10/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b213a7f6 FindFreetype: Find release and debug libraries separately
| * | | | | | | FindFreetype: Find release and debug libraries separatelyStuart Mentzer2016-06-171-10/+22
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge topic 'revert-vs-clang-minsize'Brad King2016-06-201-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | 78249be2 VS: Fix regressed mapping for the cl `/Os` compiler flag
generated by cgit v0.12 at 2024-11-14 22:06:13 (GMT)