summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-policy-CMP0064-version'Brad King2015-09-223-2/+12
|\ | | | | | | | | 402bf096 CMP0064: Fix recorded version of introduction to be 3.4
| * CMP0064: Fix recorded version of introduction to be 3.4Brad King2015-09-213-2/+12
| | | | | | | | | | This policy was added for CMake 3.4 but accidentally recorded as 3.3. Fix this and update the RunCMake.CMP0064 test WARN case accordingly.
* | Merge topic 'fix-windows-version-detection'Brad King2015-09-223-5/+27
|\ \ | | | | | | | | | | | | 17009189 Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8 (#15674)
| * | Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8 (#15674)Gilles Khouzam2015-09-213-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to GetVersionEx documentation: https://msdn.microsoft.com/en-us/library/windows/desktop/ms724451.aspx https://msdn.microsoft.com/en-us/library/windows/desktop/dn481241.aspx we must manifest each application to explicitly declare support for each version of Windows.
* | | CMake Nightly Date StampKitware Robot2015-09-221-1/+1
| |/ |/|
* | Merge topic 'pkg-config-variable-function'Brad King2015-09-215-5/+47
|\ \ | | | | | | | | | | | | | | | 51b83f14 FindPkgConfig: add a command to query arbitrary variables 7f7f1eec FindPkgConfig: use execute_process to strip trailing whitespace
| * | FindPkgConfig: add a command to query arbitrary variablesBen Boeckel2015-09-215-3/+45
| | |
| * | FindPkgConfig: use execute_process to strip trailing whitespaceBen Boeckel2015-09-181-2/+2
| | |
* | | Merge topic 'cpack-verbatim-variables'Brad King2015-09-217-8/+68
|\ \ \ | | | | | | | | | | | | | | | | bc2e54db Introduction of CPACK_VERBATIM_VARIABLES variable
| * | | Introduction of CPACK_VERBATIM_VARIABLES variableRoman Donchenko2015-09-207-8/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If variable is set to TRUE, values of all variables prefixed with CPACK_ will be escaped so special characters such as dolar sign, quotes or foreward slash will not be lost. By default variable is treated as set to FALSE for back compatibility. The cpack_encode_variables macro is changed into a function to remove scope pollution. There should be no other effects.
* | | | Merge topic 'cpack-deb-checksum-on-symlinks'Brad King2015-09-215-17/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | da295f45 CPack/Deb: checksum on symlinks release notes 7c7874c8 CPackDeb: preventing md5sum on symlinks
| * | | | 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 'fix-compatibility-mode-LOCATION'Brad King2015-09-218-9/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2514e426 CMP0026: Use compatibility codepath until configure is finished (#15748) b98f7712 cmGlobalGenerator: Add API for the configure step being finished. b5de2bd9 cmLocalGenerator: Simplify condition.
| * | | | CMP0026: Use compatibility codepath until configure is finished (#15748)Stephen Kelly2015-09-185-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use it instead of the similar cmMakefile API. It is necessary to know that the Configure step is completely done, not just that one particular cmMakefile is finished configuring. Prior to commit 611220f7 (cmTarget: Use reliable test for CMP0024 and CMP0026 OLD., 2015-07-25), this was determined by checking whether cmGeneratorTargets exist yet, which happens after the Configure step.
| * | | | cmGlobalGenerator: Add API for the configure step being finished.Stephen Kelly2015-09-182-0/+8
| | | | |
| * | | | cmLocalGenerator: Simplify condition.Stephen Kelly2015-09-181-1/+1
| |/ / / | | | | | | | | | | | | This API is only called after configure-time.
* | | | Merge topic 'ninja-refactor-msvc-deps'Brad King2015-09-219-66/+68
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 109a7a24 Ninja: Detect MSVC /showIncludes prefix with compiler flags (#15596) 828c05b9 Ninja: Refactor lookup of cmcldeps location c73fbda6 CMakeDetermineCompilerId: Drop unused code path
| * | | | Ninja: Detect MSVC /showIncludes prefix with compiler flags (#15596)Brad King2015-09-186-38/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move detection over to the compiler id logic where we have already constructed the list of compiler flags from ARG1 and CMAKE_<LANG>_FLAGS. Pass the flags when we execute "cl" with "/showIncludes". Also pass "/c" because we only need to compile, not link. Check the compiler process exit code before trusting its output.
| * | | | Ninja: Refactor lookup of cmcldeps locationBrad King2015-09-186-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | This executable comes with CMake so just compute its location in cmSystemTools instead of storing it in compiler information modules.
| * | | | CMakeDetermineCompilerId: Drop unused code pathBrad King2015-09-181-23/+11
| |/ / / | | | | | | | | | | | | | | | | The execute_process command always exists so we never need to fall back on exec_program.
* | | | Merge topic 'ctest-custom-output-size'Brad King2015-09-2116-1/+148
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | fd47df45 CTest: Add options to limit output of passed and failed tests 6e3151f6 CTest: Document and test custom output size settings
| * | | | CTest: Add options to limit output of passed and failed testsRoman Wüger2015-09-189-1/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ctest command-line options: --test-output-size-passed <n> --test-output-size-failed <n> to set the amount of test output to store in Test.xml as a command-line dashboard client.
| * | | | CTest: Document and test custom output size settingsBrad King2015-09-187-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation and tests for the existing CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE CTest variables.
* | | | | CMake Nightly Date StampKitware Robot2015-09-211-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2015-09-201-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-09-191-1/+1
| |/ / |/| |
* | | 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
| |_|_|_|/ |/| | | |