summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'timeout_after_match'Brad King2016-03-225-0/+62
|\ | | | | | | | | | | de7afd29 Help: Add notes for topic 'timeout_after_match' 993e48d0 CTest: Optionally use a secondary test timeout after matching output
| * CTest: Optionally use a secondary test timeout after matching outputZack Galbreath2016-03-225-0/+62
| | | | | | | | | | | | Allow a test N seconds to complete after we detect a matching line in its output. Activate this behavior with a new TIMEOUT_AFTER_MATCH test property.
* | Merge topic 'ghs-try_compile'Brad King2016-03-221-2/+8
|\ \ | | | | | | | | | | | | bf3e76d2 GHS: Fix try_compile (#15975)
| * | GHS: Fix try_compile (#15975)Geoff Viola2016-03-211-2/+8
| | |
* | | Merge topic 'ninja-directory-targets'Brad King2016-03-222-0/+85
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9ead71df Help: Add notes for topic 'ninja-directory-targets' e9bf8ec8 Ninja: Add test for `$subdir/all` targets ca575fe9 Ninja: Add `$subdir/all` targets
| * | | Ninja: Add `$subdir/all` targetsCharles Huet2016-03-182-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the Makefile generator one can use `cd $subdir; make all` to build all targets associated with a given subdirectory. This is not possible to do with the Ninja generator since there is only one `build.ninja` file at the top of the build tree. However, we can approximate it by allowing one to run `ninja $subdir/all` at the top of the tree to build the targets in the corresponding subdirectory. Port logic from cmGlobalUnixMakefileGenerator3::WriteDirectoryRule2 to cmGlobalNinjaGenerator in order to produce equivalent directory-level targets.
* | | | CMake Nightly Date StampKitware Robot2016-03-221-1/+1
| |/ / |/| |
* | | Merge topic 'cpack-osx-optional-CoreServices'Brad King2016-03-212-1/+20
|\ \ \ | | | | | | | | | | | | | | | | d84ba668 CPack: Avoid using OS X CoreServices if compiler fails on header (#16021)
| * | | CPack: Avoid using OS X CoreServices if compiler fails on header (#16021)Brad King2016-03-182-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | Some compilers on OS X report errors in the CoreServices framework headers. Check for support of the header ahead of time and compile the relevant code only when the header is available.
* | | | CMake Nightly Date StampKitware Robot2016-03-211-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2016-03-201-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2016-03-191-1/+1
| |/ / |/| |
* | | Merge topic 'cmake-gui-osx-identifier'Brad King2016-03-181-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 7b990e82 cmake-gui: Populate CFBundleIdentifier in our Info.plist file (#16023)
| * | | cmake-gui: Populate CFBundleIdentifier in our Info.plist file (#16023)Brad King2016-03-171-0/+1
| | | |
* | | | Merge topic 'cpack-osx-no-carbon'Brad King2016-03-182-16/+7
|\ \ \ \ | | |/ / | |/| | | | | | | | | | c718070c CPack: Avoid requiring Carbon framework on OS X (#16021)
| * | | CPack: Avoid requiring Carbon framework on OS X (#16021)Sean McBride2016-03-172-16/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.5.0-rc1~232^2 (CPackDMG: Add support for multilingual SLAs, 2015-10-19) we added use of the Carbon framework in order to get access to its APIs to convert Script Manager RegionCode values. This is not necessary. Instead we can use CoreServices. While at it, replace individual CoreFoundation includes with including the entire framework, which is the correct way.
| * | CMake 3.5.0v3.5.0Brad King2016-03-081-1/+1
| | |
| * | Merge branch 'vs14-debug-enum-older-toolsets' into releaseBrad King2016-03-071-0/+28
| |\ \
| | * | VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986)Brad King2016-03-071-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.4.2~2^2 (VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation, 2016-01-08) we generate invalid project files for the v110 and v120 toolsets. VS complains: C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.CppCommon.targets(639,9): error MSB4030: "Debug" is an invalid value for the "GenerateDebugInformation" parameter of the "Link" task. The "GenerateDebugInformation" parameter is of type "System.Boolean". This reveals that our VS flag map selection should be based on the toolset instead of the version of VS. However, that will be a non-trivial change so for now fix this particular use case by hard-coding a correction to the flag map. Reported-by: Gregor Jasny <gjasny@googlemail.com>
| * | | CMake 3.5.0-rc3v3.5.0-rc3Brad King2016-02-181-1/+1
| | | |
| * | | Merge branch 'fix-static-private-non-target-depends' into releaseBrad King2016-02-172-5/+23
| |\ \ \
| * \ \ \ Merge branch 'fix-cmake_parse_arguments-expansion' into releaseBrad King2016-02-121-2/+10
| |\ \ \ \
| * \ \ \ \ Merge branch 'cmake-gui-reset-generator' into releaseBrad King2016-02-121-0/+7
| |\ \ \ \ \
| * | | | | | CMake 3.5.0-rc2v3.5.0-rc2Brad King2016-02-101-1/+1
| | | | | | |
| * | | | | | Merge branch 'curl-pre-7.21.5' into releaseBrad King2016-02-091-0/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fix-target-lookup-performance-regression' into releaseBrad King2016-02-084-62/+47
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fix-install-EXPORT-crash' into releaseBrad King2016-02-081-3/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'fix-Fortran-module-in-subdir' into releaseBrad King2016-02-081-4/+2
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge topic 'vs-remote-directory'Brad King2016-03-181-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3bcf2aa VS: Fix WinCE remote debugger tool per-config target name
| * | | | | | | | | | | VS: Fix WinCE remote debugger tool per-config target nameBrad King2016-03-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the DebuggerTool RemoteExecutable value added by commit a22f9967 (VS: Optionally generate remote directory for WinCE projects, 2016-02-15) to account for the configuration when computing the target name.
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-181-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'use-GetCMakeRoot'Brad King2016-03-178-25/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3144857e Avoid depending on CMAKE_ROOT cache entry internally (#16015)
| * | | | | | | | | | | | Avoid depending on CMAKE_ROOT cache entry internally (#16015)Brad King2016-03-168-25/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use cmSystemTools::GetCMakeRoot() which always knows the location of our resources. Do not depend on CMAKE_ROOT because the user could unset it from the cache.
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-171-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'vs-remote-directory'Brad King2016-03-162-0/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a22f9967 VS: Optionally generate remote directory for WinCE projects
| * | | | | | | | | | | | VS: Optionally generate remote directory for WinCE projectsAndrej Bosik2016-03-152-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the VS 2008 and 2005 generators to set the `RemoteDirectory` in `DeploymentTool` and the `RemoteExecutable` in `DebuggerTool`. Use a `DEPLOYMENT_REMOTE_DIRECTORY` target property to specify the value.
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-161-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-151-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge topic 'remove-vs7.0-generator'Brad King2016-03-143-250/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f47b4f68 Drop Visual Studio 7 generator for VS .NET 2002
| * | | | | | | | | | | Drop Visual Studio 7 generator for VS .NET 2002Brad King2016-03-113-250/+7
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This generator has been deprecated since CMake 3.3. Remove it.
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-141-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-131-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-121-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-111-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge topic 'update-kwsys'Brad King2016-03-103-0/+29
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd466fe6 Merge branch 'upstream-KWSys' into update-kwsys cd4fef30 KWSys 2016-03-09 (36d8666f)
| * | | | | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-03-093-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-03-09 (36d8666f)
* | | | | | | | | | | Merge topic 'remove-vs6-generator'Brad King2016-03-1015-3087/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b42866a3 Drop Visual Studio 6 generator cd9ba3ec cmLocalVisualStudio7Generator: Fix name of helper function
| * | | | | | | | | | | Drop Visual Studio 6 generatorBrad King2016-03-0914-3084/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This generator has been deprecated since CMake 3.3. Remove it. Update documentation, modules, and tests to drop content specific to this generator.
| * | | | | | | | | | | cmLocalVisualStudio7Generator: Fix name of helper functionBrad King2016-03-091-3/+3
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `cmLVS6G_IsFAT` to `cmLVS7G_IsFAT` since it is for the local VS 7 generator and not VS 6.
* | | | | | | | | | | Merge topic 'vs-clang-cl'Brad King2016-03-102-1/+32
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 491b41dd Help: Add notes for topic 'vs-clang-cl' ad6d27ac Tests: do not build PrecompiledHeader on Clang/C2 a0f0541f Tests: fix PDBDirectoryAndName on Clang/C2 3541af67 Tests: fix Plugin building on Clang/C2 1902c293 Tests: fix complexOneConfig building on Clang/C2 cab2ec11 Tests: fix Complex building on Clang/C2 ada3736c Tests: fix Module.GenerateExportHeader building on Clang/C2 123b7e13 Tests: fix AliasTarget building on Clang/C2 445d4d4b VS 14: Add flag map for -std= to CppLanguageStandard tag in project files 0a785eb4 Features: Clang has no cxx_decltype_incomplete_return_type in MSVC sim mode 2c2ec488 VS: in Clang/C2 toolset, setup correct compiler settings 37afe00f CMakeDetermineCompilerId: Add detection of clang.exe bundled with VS