summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Encoding: Add setlocale() to applications.Clinton Stimpson2014-06-044-0/+10
| | | | See also bug #14934 where chinese characters could not be used with cpack.
* CMake Nightly Date StampKitware Robot2014-05-301-1/+1
|
* Merge topic 'normalize-custom-command-paths'Brad King2014-05-293-1/+42
|\ | | | | | | | | c4af46b4 add_custom_command: Normalize OUTPUT and DEPENDS paths.
| * add_custom_command: Normalize OUTPUT and DEPENDS paths.Stephen Kelly2014-05-283-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While tracing dependencies of a target, cmTargetTraceDependencies follows sources by full path to determine if the source is to be produced by a custom command. Commit 4959f341 (cmSourceFileLocation: Collapse full path for directory comparisons., 2014-03-27) changed the storage of target sources to be in the form of a normalized path instead of an unnormalized path. The path is followed by looking it up in a mapping via cmMakefile::GetSourceFileWithOutput to acquire an appropriate cmSourceFile. The mapping is populated with the OUTPUT components of add_custom_command invocations, however it is populated with unnormalized paths. This means that the tracing logic does not find appropriate cmSourceFiles, and does not generate appropriate build rules for the generated sources. Normalize the paths in the OUTPUT components of add_custom_command to resolve this. The paths in the DEPENDS component of add_custom_command are also not normalized, leading to the same problem again. Normalize the depends paths after generator evaluation and expansion.
* | Merge topic 'dpkg-shlibdeps-locale'Brad King2014-05-291-1/+1
|\ \ | | | | | | | | | | | | 21ec5f84 CPackDeb: Invoke "dpkg-shlibdeps --version" with C locale
| * | CPackDeb: Invoke "dpkg-shlibdeps --version" with C localeNils Gladitz2014-05-281-1/+1
| | | | | | | | | | | | The version message is localized and may not match when a non-english locale is in use.
* | | Merge topic 'vs-vcproj-bool-case'Brad King2014-05-292-31/+31
|\ \ \ | | | | | | | | | | | | | | | | b684ce58 VS: Use lower-case boolean values in VS 7-9 (#14927)
| * | | VS: Use lower-case boolean values in VS 7-9 (#14927)Mark Salisbury2014-05-282-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The VS 7-9 IDEs parse .vcproj file boolean values in lower or upper case. The .NET XML parsing chokes on anything but "true", "false", "0", "1". Teach our generators to use lower-case names since they will work for both parsers. Our VS >= 10 flag tables already use lower-case.
* | | | Merge topic 'FindDoxygen-windows-dot'Brad King2014-05-291-5/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | f49b6a33 FindDoxygen: Deprecate DOXYGEN_DOT_PATH 7980eab8 FindDoxygen: Improve search for Graphviz "dot" on Windows
| * | | | FindDoxygen: Deprecate DOXYGEN_DOT_PATHBrad King2014-05-271-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While at it, do not cache the value since it should always be computed directly from DOXYGEN_DOT_EXECUTABLE. Inspired-by: Lars Bilke <larsbilke83@googlemail.com>
| * | | | FindDoxygen: Improve search for Graphviz "dot" on WindowsBrad King2014-05-271-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of Graphviz 2.31, their installer provides no PATH or registry modifications. Glob possible install paths instead. Inspired-by: Lars Bilke <larsbilke83@googlemail.com>
* | | | | Merge topic 'cxx14-features'Brad King2014-05-2923-9/+294
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dd043c3f Features: Add support for C++14 features.
| * | | | | Features: Add support for C++14 features.Stephen Kelly2014-05-2223-9/+294
| | | | | | | | | | | | | | | | | | | | | | | | Record the features implemented by GNU 4.9 and Clang 3.4.
* | | | | | CMake Nightly Date StampKitware Robot2014-05-291-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'release'Brad King2014-05-280-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'fix-cache-self-assignment' into releaseBrad King2014-05-272-6/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'GNUtoMS-vs-12' into releaseBrad King2014-05-271-1/+3
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge topic 'fix-coverage-py'Brad King2014-05-281-9/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deee7c42 CTest: Fix Python coverage.py off-by-one error in results 88b3dcb1 CTest: Improve Python coverage.py source file search algorithm
| * | | | | | | CTest: Fix Python coverage.py off-by-one error in resultsZach Mullen2014-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cobertura format uses line numbers indexed starting at 1, and CTest uses a vector indexed starting at 0 to store them.
| * | | | | | | CTest: Improve Python coverage.py source file search algorithmRoni Choudhury2014-05-281-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the coverage.py source file is not found in the source directory, the build directory is first searched before raising an error. This is necessary because it is a valid workflow to build a Python package from source, then install this package to a virtualenv that lives in the build directory. Tests will run against this deployed package and therefore the covered source files will be found in a subdirectory of the build directory, and not anywhere in the source directory.
* | | | | | | | Merge topic 'cpack-properties'Brad King2014-05-2847-15/+650
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0b1d2a6 CPackWiX: Implement CPACK_NEVER_OVERWRITE and CPACK_PERMANENT properties 15a8af21 Add an "installed file" property scope
| * | | | | | | | CPackWiX: Implement CPACK_NEVER_OVERWRITE and CPACK_PERMANENT propertiesNils Gladitz2014-05-286-3/+38
| | | | | | | | |
| * | | | | | | | Add an "installed file" property scopeNils Gladitz2014-05-2842-12/+612
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach set_property and get_property an "INSTALL" property type to be associated with install-tree file paths. Make the properties available to CPack for use during packaging. Add a "prop_inst" Sphinx domain object type for documentation of such properties.
* | | | | | | | | Merge topic 'FindFreetype-updates'Brad King2014-05-281-25/+48
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58f7baab FindFreetype: Indent with 2 spaces instead of 4 444f8801 FindFreetype: Use lower-case name in call to FPHSA 836a28d5 FindFreetype: Move PATH_SUFFIXES argument for more consistency 4ad6dace FindFreetype: Add newlines to reduce code width
| * | | | | | | | | FindFreetype: Indent with 2 spaces instead of 4Taylor Holberton2014-05-271-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more consistent with style elsewhere.
| * | | | | | | | | FindFreetype: Use lower-case name in call to FPHSATaylor Holberton2014-05-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 'find_package_handle_standard_args' because lower-case style is now preferred.
| * | | | | | | | | FindFreetype: Move PATH_SUFFIXES argument for more consistencyTaylor Holberton2014-05-271-1/+2
| | | | | | | | | |
| * | | | | | | | | FindFreetype: Add newlines to reduce code widthTaylor Holberton2014-05-271-9/+30
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | This also makes argument lists easier to update.
* | | | | | | | | Merge topic 'GNUtoMS-vs-12'Brad King2014-05-281-1/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | 668e571d GNUtoMS: Add support for VS 2013 (#14936)
| * | | | | | | | GNUtoMS: Add support for VS 2013 (#14936)Brad King2014-05-271-1/+3
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add to the Platform/Windows-GNU module list of VS registry entries those for VS 2013. Also add the name "vcvars64.bat" used by VS 10 and above for 64-bit tools.
* | | | | | | | Merge topic 'fix-cache-self-assignment'Brad King2014-05-282-6/+5
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | | | | | | | | 1cd37527 cmCacheManager: Avoid cache entry self-assignment 326d15a3 cmake: Tolerate missing HELPSTRING on compiler change
| * | | | | | cmCacheManager: Avoid cache entry self-assignmentBrad King2014-05-271-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit bef93dc5 (Couple of changes: cache variables now have a map of properties, 2002-09-11) the cmCacheManager::AddCacheDefinition method accesses its map entry by reference. However, the commit left the original entry assignment at the end of the method. With Apple Clang 5.1 and libc++ this self-assignment destroys the cache entry property map. Drop the self assignment. Also drop the condition around the call to UnwatchUnusedCli since it was a self-comparison that must always have been true.
| * | | | | | cmake: Tolerate missing HELPSTRING on compiler changeBrad King2014-05-271-1/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach cmake::HandleDeleteCacheVariables to tolerate a missing HELPSTRING (NULL pointer) when saving cache entries. In the absence of other bugs this should not be possible, but avoid the crash just in case.
* | | | | | CMake Nightly Date StampKitware Robot2014-05-281-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'doc-file-command'Brad King2014-05-271-178/+266
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d74ed543 Help: Format and revise file() command documentation
| * | | | | Help: Format and revise file() command documentationBrad King2014-05-231-178/+266
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Organize the documentation by sub-command to keep the signatures and their descriptions nearby. Use inline and explicit reST markup. Revise wording as necessary for the updated layout. Clarify behavior of the file(GENERATE) command w.r.t. conflicting file names.
* | | | | Merge topic 'doc-CTEST_BUILD_FLAGS'Brad King2014-05-271-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b8d6ab60 Help: describe CTEST_BUILD_FLAGS
| * | | | | Help: describe CTEST_BUILD_FLAGSRolf Eike Beer2014-05-231-0/+5
| |/ / / /
* | | | | Merge topic 'revise-CTestTestTimeout'Brad King2014-05-277-37/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9afcecaf Tests: Try to make CTestTestTimeout more robust
| * | | | | Tests: Try to make CTestTestTimeout more robustBrad King2014-05-237-37/+40
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write to the timeout test log file before sleeping and flush to be sure it is created. Move the check that the after-sleep line is not written out to the ctest script. Rename the CheckChild test to TestSleep since it no longer checks. Do not try to read the log file if it does not exist.
* | | | | Merge topic 'compile-features-manual'Brad King2014-05-2724-6/+411
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca5d990f Help: Add a manual for compiler feature control. b4d33f64 Features: Add missing variable reference in docs.
| * | | | | Help: Add a manual for compiler feature control.Stephen Kelly2014-05-2724-6/+403
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to it from the documentation of related properties, variables and commands. Extend the cmake-developer(7) documentation with notes on extending feature support for compilers.
| * | | | | Features: Add missing variable reference in docs.Stephen Kelly2014-05-222-0/+8
| | |_|_|/ | |/| | |
* | | | | Merge topic 'dev/CMP0053-variable_watch'Brad King2014-05-2711-1/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9ba91463 tests: test CMP0053 in WARN mode when watching variables
| * | | | | tests: test CMP0053 in WARN mode when watching variablesBen Boeckel2014-05-2211-1/+46
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CMP0053 is in WARN mode, variables get expanded twice, leaking the fact that the string was expanded twice and changing behavior. Instead, suppress variable watches when running the expansion to trigger the CMP0053 warning.
* | | | | Merge topic 'variable_watch-no-allowed-access'Brad King2014-05-274-14/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d8498003 variable_watch: Remove undocumented and redundant access type
| * | | | | variable_watch: Remove undocumented and redundant access typeBen Boeckel2014-05-224-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS access type was switched on an undocumented variable and its lookup caused an unnecessary performance impact. Remove it.
* | | | | | CMake Nightly Date StampKitware Robot2014-05-271-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-05-261-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-05-251-1/+1
| | | | | |