summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CPack/Deb: checksum on symlinks release notesDomen Vrankar2015-09-181-0/+4
|
* CPackDeb: preventing md5sum on symlinksRaffi Enficiaud2015-09-184-17/+45
| | | | | | - Direct call to cmSystemTools::ComputeFileMD5 - Avoiding hashing symlinks - Tests
* Merge topic 'compute-default-dialect'Brad King2015-09-1814-19/+66
|\ | | | | | | | | 7235334a Project: Determine default language dialect for the compiler.
| * Project: Determine default language dialect for the compiler.Stephen Kelly2015-09-1814-19/+66
| | | | | | | | | | | | Use the __cplusplus and __STDC_VERSION__ macros to automatically determine the default dialect for the compiler while determining its id and version.
* | Merge topic 'FindPython-updates'Brad King2015-09-181-19/+60
|\ \ | | | | | | | | | | | | | | | | | | 19934b67 FindPythonLibs: unset temporary _PREFIX variable f8bc4e11 FindPythonLibs: Use python executable prefix as a hint a9d32dff FindPythonLibs: Match include dir to library version
| * | FindPythonLibs: unset temporary _PREFIX variableDavid Gobbi2015-09-171-11/+14
| | | | | | | | | | | | To avoid pollution, unset variables that are only meant for local use.
| * | FindPythonLibs: Use python executable prefix as a hintDavid Gobbi2015-09-171-0/+21
| | | | | | | | | | | | | | | | | | If PYTHON_EXECUTABLE is set, then we should look for the libs in the same prefix, e.g. /usr/local/python -> /usr/local/lib, and on Win32 /Python34/python.exe -> /Python34/libs.
| * | FindPythonLibs: Match include dir to library versionDavid Gobbi2015-09-171-19/+36
| | | | | | | | | | | | | | | | | | This commit ensures that FindPythonLibs has found the library before before the search for the include dir begins. The library prefix and version can then be used to find the matching include dir.
* | | Merge topic 'cmake-gui-qt5-package'Brad King2015-09-181-11/+5
|\ \ \ | | | | | | | | | | | | | | | | 851915a5 cmake-gui: Improve packaging of Qt5 libraries.
| * | | cmake-gui: Improve packaging of Qt5 libraries.Clinton Stimpson2015-09-171-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #15685, where the right Qt5 dlls on Windows were not packaged because they were not found when relying on the PATH environment variable. Also some cleanup of code introduced in 8120e13f, but no longer needed with 678aaad1.
* | | | Merge topic 'ms-manifest-files'Brad King2015-09-1830-213/+446
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e134e53b Add support for *.manifest source files with MSVC tools da00be63 MSVC: Rewrite manifest file handling with Makefile and Ninja d488b5c9 Ninja: Always add OBJECT_DIR variable to link rules 6d620f5a VS: Add manifest tool settings to VS 8 and 9 project files
| * | | | Add support for *.manifest source files with MSVC toolsBrad King2015-09-1729-7/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Classify .manifest sources separately, add dependencies on them, and pass them to the MS manifest tool to merge with linker-generated manifest files. Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
| * | | | MSVC: Rewrite manifest file handling with Makefile and NinjaBrad King2015-09-173-200/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a helper class private to "cmcmd.cxx" to contain the implementation. Update the link logic to use the intermediate files directory for each target to hold manifest and resource files before embedding into the binary. Preserve the old behavior of placing the .manifest file next to the binary when not linking incrementally even though it will be embedded.
| * | | | Ninja: Always add OBJECT_DIR variable to link rulesBrad King2015-09-171-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | The <OBJECT_DIR> placeholder is always available in Makefile generators so make it available from the Ninja generator too.
| * | | | VS: Add manifest tool settings to VS 8 and 9 project filesBrad King2015-09-171-10/+14
| | | | | | | | | | | | | | | | | | | | Always generate a VCManifestTool element in targets that compile.
* | | | | Merge topic 'test-RunCMake-BuildDepends'Brad King2015-09-188-1/+84
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | 73a058f8 Tests: Add RunCMake.BuildDepends test 438fabf2 Tests: Teach RunCMake infrastructure to use custom check.cmake file
| * | | | Tests: Add RunCMake.BuildDepends testBrad King2015-09-177-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | | This will allow more granular checks than the main BuildDepends test. Start with a simple single-source C program.
| * | | | Tests: Teach RunCMake infrastructure to use custom check.cmake fileBrad King2015-09-171-1/+5
| | | | |
* | | | | Merge topic 'test-RunCMake-exclude-more-output'Brad King2015-09-181-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | f38625be Tests: Teach RunCMake to tolerate 'Bullseye Testing' lines in test output 1a75a966 Tests: Teach RunCMake to tolerate 'Time Machine' lines in test output
| * | | | Tests: Teach RunCMake to tolerate 'Bullseye Testing' lines in test outputBrad King2015-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When testing under Bullseye coverage, some tests get lines on stderr of the form: ... Bullseye Testing Technology ... Remove such lines from output before matching because they are not representative of the actual test output.
| * | | | Tests: Teach RunCMake to tolerate 'Time Machine' lines in test outputBrad King2015-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some OS X machines some tests get lines on stderr of the form: ... attempting to exclude an item from Time Machine by path ... produced by the system. Remove such lines from output before matching because they are not representative of the actual test output.
* | | | | Merge topic 'ExternalProject_stash_save_all'Brad King2015-09-182-17/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c5b6ed5 ExternalProject: Use "git stash save --all" only if supported (#15722) b04c3815 ExternalProject: Use GIT_VERSION_STRING instead of custom method
| * | | | | ExternalProject: Use "git stash save --all" only if supported (#15722)Daniele E. Domenichelli2015-09-172-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | The --all option for git-stash wasn't introduced until git version 1.7.6.
| * | | | | ExternalProject: Use GIT_VERSION_STRING instead of custom methodDaniele E. Domenichelli2015-09-171-16/+1
| | |/ / / | |/| | | | | | | | | | | | | GIT_VERSION_STRING is available in FindGit.cmake since CMake version 2.8.8
* | | | | CMake Nightly Date StampKitware Robot2015-09-181-1/+1
| | | | |
* | | | | Merge topic 'cpack-deb-fakeroot-removal'Brad King2015-09-1712-139/+420
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | becb14c9 CPack/DEB: test preserve extra config file permissions 7044e8ee CPackDeb: use of libarchive and removal of fakeroot 415405a3 cmArchiveWrite: control user/group, permissions and recursive file adding 4f2ff601 Tests: Make RunCMake.CPack error messages more readable 81b748ae cmGeneratedFileStream: Fix spelling in comment
| * | | | | CPack/DEB: test preserve extra config file permissionsDomen Vrankar2015-09-173-5/+42
| | | | | |
| * | | | | CPackDeb: use of libarchive and removal of fakerootRaffi Enficiaud2015-09-174-120/+241
| | | | | |
| * | | | | cmArchiveWrite: control user/group, permissions and recursive file addingRaffi Enficiaud2015-09-172-6/+128
| | | | | |
| * | | | | Tests: Make RunCMake.CPack error messages more readableRaffi Enficiaud2015-09-173-6/+7
| | | | | |
| * | | | | cmGeneratedFileStream: Fix spelling in commentRaffi Enficiaud2015-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | s/destionation/destination/
* | | | | | Merge branch 'release'Brad King2015-09-170-0/+0
|\ \ \ \ \ \
| * | | | | | CMake 3.3.2v3.3.2Brad King2015-09-161-1/+1
| | | | | | |
* | | | | | | Merge topic 'FindPython-updates'Brad King2015-09-172-10/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | / / | | |_|_|/ / | |/| | | | | | | | | | | | | | | | ea2db3bb FindPythonLibs: Fix OS X framework include directory search path c57334fa FindPythonLibs: Remove PYTHON_INCLUDE_PATH as input 2db092b1 FindPython{Interp,Libs}: Add versions 3.5 and 3.6
| * | | | | FindPythonLibs: Fix OS X framework include directory search pathDavid Gobbi2015-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use PATH_SUFFIXES to append "python<v>" to each candidate path. Do not append it to the constructed list of python framework include directories. Otherwise the combined path will never exist. Note that the code doesn't yet try to match the suffixes "m" and "u" between the executable, library, and include directory.
| * | | | | FindPythonLibs: Remove PYTHON_INCLUDE_PATH as inputDavid Gobbi2015-09-161-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cmake variable has been deprecated for over a decade, and using it as an input could potentially cause unexpected results. We still need to keep it as an output variable for compatibility though.
| * | | | | FindPython{Interp,Libs}: Add versions 3.5 and 3.6David Gobbi2015-09-162-2/+2
| | | | | |
* | | | | | Merge topic 'remove-UseVTKConfig40'Brad King2015-09-173-476/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | 6a06ec8d Modules: Drop unused VTK 4.0 support modules
| * | | | | Modules: Drop unused VTK 4.0 support modulesBrad King2015-09-163-476/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | These modules have been unused since commit v3.1.0-rc1~355^2 (FindVTK: Drop support for finding VTK 4.0, 2014-06-27).
* | | | | CMake Nightly Date StampKitware Robot2015-09-171-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2015-09-160-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge branch 'fix-bad-search-ordering' into releaseBrad King2015-09-142-3/+8
| |\ \ \
| * \ \ \ Merge branch 'makefile-color-when-needed' into releaseBrad King2015-08-281-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'fix-ctest-xml-double-encoding' into releaseBrad King2015-08-288-20/+8
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'determine-compiler-CMP0054' into releaseBrad King2015-08-202-6/+8
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'detect-c11-broken-thread-local'Brad King2015-09-163-1/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ffa6f057 Avoid using C11 to build CMake if _Thread_local support is broken
| * | | | | | | | Avoid using C11 to build CMake if _Thread_local support is brokenRaphael Kubo da Costa2015-09-153-1/+41
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for C11's _Thread_local was introduced in GCC in the 4.9 series, even though we make the C11 compiler flags available in CMake with GCC >= 4.6. FreeBSD's runetype.h uses _Thread_local, which causes CMake's own build to fail when using GCC < 4.9 and -std=gnu11: /usr/include/runetype.h:92:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'const' extern _Thread_local const _RuneLocale *_ThreadRuneLocale; Add a test for _Thread_local support and only build CMake itself with C11 support if it works. Bug: http://www.cmake.org/Bug/view.php?id=15741
* | | | | | | | Merge topic 'test-search-ordering'Brad King2015-09-167-3/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a6e5f06 Tests: Cover find_program when the environment duplicate some HINTS 40122975 Merge branch 'fix-bad-search-ordering' into test-search-ordering 02440154 find_*: Fix search order when the environment duplicates some HINTS
| * | | | | | | | Tests: Cover find_program when the environment duplicate some HINTSBrad King2015-09-155-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported-by: Marc CHEVRIER <marc.chevrier@sap.com>
| * | | | | | | | Merge branch 'fix-bad-search-ordering' into test-search-orderingBrad King2015-09-152-3/+8
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |