summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Intel-C: support gnu89 and gnu99 extension flagsBen Boeckel2016-08-021-2/+2
|
* Intel-C: declare support for gnu11Ben Boeckel2016-08-021-1/+1
| | | | | | | | | | | Without extensions, functions like `strdup` are not available since they are actually controlled by feature flags such as _SVID_SOURCE and _BSD_SOURCE. When using `-std=c11` on Intel, none of these flags are set, so the functions are not declared properly leading to compile errors. Reported-by: Adam J. Stewart <ajstewart426@gmail.com> Closes: #16226
* CMake 3.6.0v3.6.0Brad King2016-07-071-1/+1
|
* Merge branch 'cpack-ifw-fix-repo-attributes' into releaseBrad King2016-07-051-2/+2
|\
| * CPackIFW: Fix attributes for Promoting Updates repository replacementKonstantin Podsvirov2016-07-051-2/+2
| | | | | | | | | | Fix spelling of attributes added by commit v3.6.0-rc1~52^2 (CPackIFW: Add support for Promoting Updates, 2016-05-17).
* | Merge branch 'FindJNI-ubuntu-paths' into releaseBrad King2016-07-051-3/+4
|\ \
| * | 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 branch 'clang-format-script' into releaseBrad King2016-06-301-4/+8
|\ \
| * | clang-format.bash: Fix filter-branch example documentationBrad King2016-06-301-4/+8
| | | | | | | | | | | | | | | | | | Inside `git filter-branch --tree-filter` we must format all tracked files because formatting of the tree for each commit is independent from earlier commits.
* | | Merge branch 'doc-updates' into releaseBrad King2016-06-302-2/+18
|\ \ \ | |_|/ |/| |
| * | Help: Document CMAKE_TRY_COMPILE_PLATFORM_VARIABLES exampleBrad King2016-06-301-0/+16
| | | | | | | | | | | | Suggested-by: Hendrik Sattler <post@hendrik-sattler.de>
| * | InstallRequiredSystemLibraries: Document UCRT option use caseBrad King2016-06-301-2/+2
|/ / | | | | | | Suggested-by: Hendrik Sattler <post@hendrik-sattler.de>
* | CMake 3.6.0-rc4v3.6.0-rc4Brad King2016-06-291-1/+1
| |
* | Merge branch 'revert-try_compile-config-flags' into releaseBrad King2016-06-285-34/+0
|\ \
| * | Revert "try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes"Brad King2016-06-285-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.6.0-rc1~160^2 (try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes, 2016-04-11). The behavior it introduced can break projects that depend on the lack of such behavior. We will have to introduce a policy or other mechanism to enable the behavior in a compatible way. Simply revert it for now. See issue #16174.
* | | Merge branch 'doc-cross-reference-lang-standard-and-extensions' into releaseBrad King2016-06-284-2/+8
|\ \ \
| * | | Help: Cross reference CXX_STANDARD and CXX_EXTENSIONS (#16162)Gregor Jasny2016-06-284-2/+8
| |/ /
* | | Merge branch 'ninja-no-rsp-for-rc' into releaseBrad King2016-06-276-2/+28
|\ \ \
| * | | ninja, rc: ignore CMAKE_NINJA_FORCE_RESPONSE_FILE for RC filesBen Boeckel2016-06-276-2/+28
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.6.0-rc1~174^2 (Ninja: Honor CMAKE_NINJA_FORCE_RESPONSE_FILE for compile rules, 2016-04-06), Ninja learned to look for `CMAKE_NINJA_FORCE_RESPONSE_FILE` in the current scope or the environment in order to force response file usage for all compilation rules. However, on Windows, the RC compiler goes through cmcldeps which does a `replace(output, output + ".dep.obj")` on the command line. However, with a response file (which we name `output + ".rsp"`), the response file path is replaced instead causing the compiler to (correctly) complain that the response file `output + ".dep.obj.rsp"` does not exist. What needs to happen is for cmcldeps to look through the response file, replace *its* contents and place it in the `output + ".dep.obj.rsp"` file. Also add a test which actually compiles an RC file into a library and executable for all generators on Windows and additionally test `CMAKE_NINJA_FORCE_RESPONSE_FILE` for Ninja generators. Fixes #16167.
* | | Merge branch 'FindHDF5-handle-unsuffixed' into releaseBrad King2016-06-271-4/+21
|\ \ \
| * | | 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 'doc-osx-versions' into releaseBrad King2016-06-233-13/+43
|\ \ \
| * | | Help: Describe VERSION and SOVERSION meanings for Mach-O binariesBartosz Kosiorek2016-06-233-13/+43
| |/ /
* | | Merge branch 'backport-GetPrerequisites-typo' into releaseBrad King2016-06-231-1/+1
|\ \ \ | |/ / |/| |
| * | GetPrerequisites: fix typo in commentRolf Eike Beer2016-06-221-1/+1
|/ /
* | CMake 3.6.0-rc3v3.6.0-rc3Brad King2016-06-221-1/+1
| |
* | Merge branch 'doc-VS_STARTUP_PROJECT-clarify' into releaseBrad King2016-06-211-1/+7
|\ \
| * | Help: Clarify VS_STARTUP_PROJECT documentationBrad King2016-06-211-1/+7
| | | | | | | | | | | | | | | | | | | | | Explain in what directory the property should be set to affect the corresponding ``.sln`` file. Suggested-by: Stephen Kelly <steveire@gmail.com>
* | | Merge branch 'update-libarchive' into releaseBrad King2016-06-2019-49/+88
|\ \ \
| * \ \ Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2016-06-2019-49/+88
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * upstream-LibArchive: LibArchive 2016-06-19 (139d0576)
| | * | | LibArchive 2016-06-19 (139d0576)LibArchive Upstream2016-06-2022-52/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libarchive/libarchive.git at commit 139d0576b51a253732a5ab1f66805dffbf8b00af (master).
* | | | | Merge branch 'cpack-deb-test-fixes' into releaseBrad King2016-06-203-10/+13
|\ \ \ \ \
| * | | | | CPack/Deb: Fix test to actually test the preinst scriptDomen Vrankar2016-06-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test regex variable name was invalid and did not test preinst script. Reported-by: Patrick <mail6543210@yahoo.com.tw>
| * | | | | CPack/Deb: Fix tests for SELinux-enabled systemsDomen Vrankar2016-06-203-10/+13
| | |_|/ / | |/| | | | | | | | | | | | | Suggested-by: Patrick <mail6543210@yahoo.com.tw>
* | | | | Merge branch 'pkgconfig-targets' into releaseBrad King2016-06-201-2/+6
|\ \ \ \ \
| * | | | | FindPkgConfig: define the imported targets also when the data comes from cacheRolf Eike Beer2016-06-191-2/+6
| |/ / / /
* | | | | Merge branch 'FindQt4-doc-QtDeclarative-imported' into releaseBrad King2016-06-201-0/+2
|\ \ \ \ \
| * | | | | FindQt4: Document Qt4::QtDeclarative imported target (#16157)Brad King2016-06-201-0/+2
| |/ / / /
* | | | | Merge branch 'doc-issue-tracker-move' into releaseBrad King2016-06-171-1/+1
|\ \ \ \ \
| * | | | | README: Update Issue Tracker link to new locationBrad King2016-06-171-1/+1
| |/ / / /
* | | | | Merge branch 'CodeBlocks-include-order' into releaseBrad King2016-06-171-7/+11
|\ \ \ \ \
| * | | | | cmExtraCodeBlocksGenerator: Do not shuffle include directoriesTobias Hunger2016-06-171-7/+11
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Report include directories in a sensible order. Do not shuffle them when trying to make them unique.
* | | | | Merge branch 'revert-vs-clang-minsize' into releaseBrad King2016-06-172-2/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | VS: Fix regressed mapping for the cl `/Os` compiler flagBrad King2016-06-172-2/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.6.0-rc1~279^2~10 (VS: in Clang/C2 toolset, setup correct compiler settings, 2016-02-18) a flag mapping was added for the clang `-Os` flag. However, this collides with a mapping we already had for the MSVC flag of the same name. This is a symptom of a larger problem in that the VS generators need a per-toolset flag map (issue #16153). For now, simply drop the new mapping and drop `-Os` from clang compiler flags in the MinSizeRel configuration. Reported-by: Felix Bruns <felixbruns@gmail.com>
* | | | CMake 3.6.0-rc2v3.6.0-rc2Brad King2016-06-131-1/+1
| | | |
* | | | Merge branch 'bash-completion' into releaseBrad King2016-06-103-2/+53
|\ \ \ \