summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* genex: remove the need for backtracesBen Boeckel2014-06-0520-125/+117
| | | | | Rather than making dummy backtraces and passing them around, just make backtraces optional.
* cmake: remove dummy backtraces for IssueMessageBen Boeckel2014-06-055-17/+14
|
* cmMakefile: return a backtraceBen Boeckel2014-06-0510-69/+38
| | | | | This allows backtraces to be fully controlled by the makefile rather than externally (and makes changing how they are manipulated easier).
* Merge topic 'delay-generator-toolset'Brad King2014-06-059-36/+52
|\ | | | | | | | | | | | | 528e8af1 Allow a toolchain file to specify a generator toolset 98afb454 VS: Split user- and generator-provided PlatformToolset 3e9f6e36 Xcode: Rename internal variable {Platform => Generator}Toolset
| * Allow a toolchain file to specify a generator toolsetBrad King2014-06-047-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay use of CMAKE_GENERATOR_TOOLSET until the CMakeSystem.cmake file has been configured and loaded during the first project() or enable_language() command. This gives the toolchain file named by CMAKE_TOOLCHAIN_FILE a chance to set CMAKE_GENERATOR_TOOLSET. This point is still early enough to set the generator toolset prior to the initialization of any languages that might use the toolset. The cmake::GeneratorToolset member variable remains an indication of what was specified by the -T option or loaded from the cache. It does not need to be updated based on the toolchain file setting. The cmMakefile::TryCompile can still pass cmake::GeneratorToolset into the inner instance because the try-compiled project will do platform and language initialization using the CMakeSystem module configured for the outer project. Extend the RunCMake.GeneratorToolset test with cases that use a toolchain file to set CMAKE_GENERATOR_TOOLSET.
| * VS: Split user- and generator-provided PlatformToolsetBrad King2014-06-044-13/+25
| | | | | | | | | | | | | | Divide the cmGlobalVisualStudio10Generator "PlatformToolset" member into two members representing the generator-selected default toolset and the user-specified CMAKE_GENERATOR_TOOLSET value. Prefer the user-specified value, if any, and then fall back to the generator-selected default.
| * Xcode: Rename internal variable {Platform => Generator}ToolsetBrad King2014-06-042-6/+6
| | | | | | | | The latter matches with CMAKE_GENERATOR_TOOLSET better.
* | Merge topic 'fix-ctest-option-summary'Brad King2014-06-051-1/+2
|\ \ | | | | | | | | | | | | 6446eb09 CTest: Added option description for --output-on-failure
| * | CTest: Added option description for --output-on-failureNils Gladitz2014-06-051-1/+2
| | | | | | | | | | | | Without it the option list is cut short after --debug.
* | | Merge topic 'expand_cobertura_coverage'Brad King2014-06-055-26/+78
|\ \ \ | | | | | | | | | | | | | | | | | | | | 50daf239 CTest: Generalize Cobertura coverage format handling a2822d30 CTest: Rename coverage implementation for "Python" to "Cobertura"
| * | | CTest: Generalize Cobertura coverage format handlingJoseph Snyder2014-06-042-9/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Cobertura coverage files written by Java. Add a test which uses the report from a Java run of Cobertura to calculate coverage. In the documentation of CTEST_COVERAGE_COMMAND, give a sample .sh file to merge the Cobertura .ser files and generate the XML report from the merged file.
| * | | CTest: Rename coverage implementation for "Python" to "Cobertura"Joseph Snyder2014-06-045-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | The coverage.py tool writes out an XML that conforms to the Cobertura Coverage tool standard. Rename the cmParsePythonCoverage files to instead be cmParseCoberturaCoverage.
* | | | Merge topic 'setlocale'Brad King2014-06-054-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 730e3862 Encoding: Add setlocale() to applications.
| * | | | 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-06-051-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'fix-build-crash-on-bad-generator'Brad King2014-06-041-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 44e2923f cmake: Fix --build crash on bad CMAKE_GENERATOR in cache
| * | | | cmake: Fix --build crash on bad CMAKE_GENERATOR in cacheBrad King2014-06-031-1/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we fail to create the generator named by CMAKE_GENERATOR, exit with an error message instead of crashing. While at it, fix the wording of the error message when CMAKE_GENERATOR is not set. Extend the RunCMake.CommandLine test with cases covering the "cmake --build" option when the named directory does not provide a CMakeCache.txt with a valid CMAKE_GENERATOR.
* | | | CMake Nightly Date StampKitware Robot2014-06-041-1/+1
| |_|/ |/| |
* | | Merge topic 'cmake-credits'Brad King2014-06-031-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 889f2fd8 Simplify and clarify credit text and link
| * | | Simplify and clarify credit text and linkBrad King2014-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | Use the name "Kitware" rather than "Kitware, Inc." to simplify the text. Provide a CMake-specific URL.
* | | | Merge topic 'cmake-credits'Brad King2014-06-031-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | 8da0a75b Simplify and clarify credit text and link
| * | | Simplify and clarify credit text and linkBrad King2014-06-031-1/+1
| |/ / | | | | | | | | | | | | Use the name "Kitware" rather than "Kitware, Inc." to simplify the text. Provide a CMake-specific URL.
* | | CMake Nightly Date StampKitware Robot2014-06-031-1/+1
| | |
* | | Merge topic 'feature-extensions-by-default'Brad King2014-06-021-2/+10
|\ \ \ | | | | | | | | | | | | | | | | 60a981ea Features: Enable compiler extensions by default.
| * | | Features: Enable compiler extensions by default.Stephen Kelly2014-05-311-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compilers enable their extensions by default, and disabling them implicitly can lead to results which are surprising or non-obvious to debug. http://public.kitware.com/pipermail/cmake-developers/2014-May/010575.html http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/10214 https://www.mail-archive.com/cmake-developers@cmake.org/msg10116.html (Compiler feature extensions by default, 29 May 2014)
* | | | CMake Nightly Date StampKitware Robot2014-06-021-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-06-011-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-05-311-1/+1
| | | |
* | | | Merge topic 'consistent-genex-target-message'Brad King2014-05-301-14/+14
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | fb2fa476 Genex: Clarify error message on use with non-binary targets (#14899).
| * | | Genex: Clarify error message on use with non-binary targets (#14899).Stephen Kelly2014-05-291-14/+14
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-05-301-1/+1
| |/ / |/| |
* | | Merge topic 'normalize-custom-command-paths'Brad King2014-05-292-1/+15
|\ \ \ | | | | | | | | | | | | | | | | c4af46b4 add_custom_command: Normalize OUTPUT and DEPENDS paths.
| * | | add_custom_command: Normalize OUTPUT and DEPENDS paths.Stephen Kelly2014-05-282-1/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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 'cxx14-features'Brad King2014-05-294-6/+41
|\ \ \ | | | | | | | | | | | | | | | | dd043c3f Features: Add support for C++14 features.
| * | | Features: Add support for C++14 features.Stephen Kelly2014-05-224-6/+41
| | | | | | | | | | | | | | | | Record the features implemented by GNU 4.9 and Clang 3.4.
* | | | CMake Nightly Date StampKitware Robot2014-05-291-1/+1
| |_|/ |/| |
* | | 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-2821-11/+517
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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-283-3/+23
| | | | |
| * | | | Add an "installed file" property scopeNils Gladitz2014-05-2818-8/+494
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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 3.0.0-rc6v3.0.0-rc6Brad King2014-05-221-1/+1
| | | | |
| * | | | Merge branch 'backport-kwsys-cygwin-fixes' into releaseBrad King2014-05-202-2/+11
| |\ \ \ \
| | * | | | KWSys Process: Workaround child kill trouble on CygwinBrad King2014-05-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we kill a child we send SIGSTOP first so that we can traverse its child processes recursively. On unwinding the recursion we then send SIGKILL. Current Cygwin has trouble when both signals are sent in quick succession by the parent process. Add a usleep(1) after sending the first signal to give up our time slice and give Cygwin a chance to process the first signal before sending the second.