summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 'ios-install-combined-one-arch'Brad King2016-03-174-1/+75
|\ \ | | | | | | | | | | | | e3fc2899 Fix iOS combined feature for single architecture targets
| * | Fix iOS combined feature for single architecture targetsRuslan Baratov2016-03-154-1/+75
| | | | | | | | | | | | | | | | | | | | | If list of valid target architectures is empty for given SDK then there will be no VALID_ARCHS build setting returned by Xcode. Return "" (empty string) explicitly in this case. This may happens if CMAKE_IOS_INSTALL_COMBINED is ON but only one architecture used in target.
* | | Merge topic 'emacs-mode-help-off-by-one'Brad King2016-03-171-1/+2
|\ \ \ | | | | | | | | | | | | | | | | 9dc384f6 cmake-mode.el: Fix help completion item lists with CMake >= 3.0 (#16019)
| * | | cmake-mode.el: Fix help completion item lists with CMake >= 3.0 (#16019)Julian Schmidt2016-03-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We run `cmake --help-*-list` to get a list of items for completion. Since CMake < 3.0 always printed "cmake version ..." on the first line of the output we have previously ignored the first line. However, CMake 3.0 and above do not print the version line so we should not ignore the first line or we miss one item. Ideally we should filter the first line out if it is "cmake version ..." in order to support CMake < 3.0 cleanly, but at worst the version line will show up as a completion option so simply including the first line is good enough for now.
* | | | 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 branch 'release'Brad King2016-03-160-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'FindBoost-optional-indirect-depends' into releaseBrad King2016-03-151-2/+12
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge topic 'FindBoost-optional-indirect-depends'Brad King2016-03-161-2/+12
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | e2f387fa FindBoost: Tolerate missing indirect dependencies (#16013)
| * | | | FindBoost: Tolerate missing indirect dependencies (#16013)Roger Leigh2016-03-151-2/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depending upon the configuration, certain components may or may not be installed, for example Boost.Regex, but other components may still have header dependencies upon these components which will obviously fail to work. Since we can't make a sensible determination with the hardcoded dependency information, we choose to interpret these dependencies less strictly.
* | | | Merge topic 'FindGTest-depends'Brad King2016-03-162-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a5d3d003 FindGTest: Automatically re-run cmake when tests change
| * | | | FindGTest: Automatically re-run cmake when tests changeZak Eckert2016-03-152-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Tell CMake that it needs to re-run when test source files parsed by `gtest_add_tests` change so that we can re-scan for tests automatically.
* | | | | Merge topic 'vs-remote-directory'Brad King2016-03-165-0/+55
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | a22f9967 VS: Optionally generate remote directory for WinCE projects
| * | | | VS: Optionally generate remote directory for WinCE projectsAndrej Bosik2016-03-155-0/+55
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'ninja-depfile-system-headers'Brad King2016-03-165-4/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6d74e787 Ninja: Add dependencies on system-provided header files (#14914)
| * | | | Ninja: Add dependencies on system-provided header files (#14914)Brad King2016-03-155-4/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When system-provided packages are upgraded we must re-compile sources depending on their headers. Use `-MD` instead of `-MMD` so that the generated depfiles do not exclude system headers. Suggested-by: Jussi Judin
* | | | 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-145-257/+15
|\ \ | | | | | | | | | | | | f47b4f68 Drop Visual Studio 7 generator for VS .NET 2002
| * | Drop Visual Studio 7 generator for VS .NET 2002Brad King2016-03-115-257/+15
| | | | | | | | | | | | 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
| | |
* | | Merge topic 'cygwin-clang'Brad King2016-03-113-0/+6
|\ \ \ | | | | | | | | | | | | | | | | 517cef8c Cygwin: Add support for Clang compiler
| * | | Cygwin: Add support for Clang compilerHan Sangjin2016-03-103-0/+6
| |/ / | | | | | | | | | | | | The platform information module for GNU on CYGWIN can be reused for Clang on CYGWIN because clang accepts almost all of the same options.
* | | Merge topic 'FindProtobuf-variable-case'Brad King2016-03-114-69/+121
|\ \ \ | | | | | | | | | | | | | | | | a7b09e7f FindProtobuf: Rename variables to match case of module name
| * | | FindProtobuf: Rename variables to match case of module nameAntonio Perez Barrero2016-03-074-69/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use recommended case for variable names. i.e. matching name of the module as passed to `find_package`. For backwards compatibility, the upper case versions of both input and output variables are used and defined when appropriate. Skip this for the _FOUND variable because FPHSA already does it. Skip this for the _VERSION variable because that was recently added and never available with the old name in a release of CMake.
* | | | 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)
| | * | | KWSys 2016-03-09 (36d8666f)KWSys Upstream2016-03-093-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 36d8666f44a75a6debb92c86c20f25d929d79cd1 (master). Upstream Shortlog ----------------- Zack Galbreath (1): 36d8666f Process: Add function to reset the start time of a process
* | | | | Merge topic 'remove-vs6-generator'Brad King2016-03-1078-4224/+67
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b42866a3 Drop Visual Studio 6 generator cd9ba3ec cmLocalVisualStudio7Generator: Fix name of helper function
| * | | | | Drop Visual Studio 6 generatorBrad King2016-03-0977-4221/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'update-third-party'Brad King2016-03-101-1/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97149ff8 update-third-party: read attributes from the worktree a35f4be6 update-third-party: Add license notice afac3d10 update-third-party: remove empty directories as well
| * | | | | update-third-party: read attributes from the worktreeBen Boeckel2016-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should be done so that any attributes for ignoring certain files when exporting can be appended to the file during the extraction step, but ignored in the actual import. Necessary for importing the gitsetup repository.
| * | | | | update-third-party: Add license noticeBrad King2016-03-091-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Our Git infrastructure scripts use the "Apache License 2.0".
| * | | | | update-third-party: remove empty directories as wellBen Boeckel2016-03-091-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | The `git ls-files | xargs rm` removes only files; directories which are empty are left laying around. This later chokes the `mv` which puts the "reduced" directory into place. Remove the empty directories as well.
* | | | | Merge topic 'clang-iframework-version'Brad King2016-03-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 63c4133b OS X: Use -iframework with Clang only on version >= 3.2
| * | | | | OS X: Use -iframework with Clang only on version >= 3.2Jean-Christophe Fillion-Robin2016-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~564^2 (OS X: Use -iframework for system framework directories, 2014-05-05) we test the version of Clang is smaller that 3.1 to see if it supports -iframework. Considering that "iframework" support has been added in clang@r142418 (Frontend: Support -iframework.) prior to clang 3.1, this made sense. That said, considering that support for multiple -iframework parameters has been added later in clang@r164607 (-iframework should allow separate arguments. ) prior to clang 3.2, this commit updates the check to enable framework support only if version is >= 3.2
* | | | | | Merge topic 'vs-clang-cl'Brad King2016-03-1015-12/+201
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Help: Add notes for topic 'vs-clang-cl'Brad King2016-03-101-0/+5
| | | | | | |
| * | | | | | Tests: do not build PrecompiledHeader on Clang/C2Mariusz Pluciński2016-03-101-1/+3
| | | | | | |
| * | | | | | Tests: fix PDBDirectoryAndName on Clang/C2Mariusz Pluciński2016-03-101-0/+9
| | | | | | |
| * | | | | | Tests: fix Plugin building on Clang/C2Mariusz Pluciński2016-03-101-0/+7
| | | | | | |
| * | | | | | Tests: fix complexOneConfig building on Clang/C2Mariusz Pluciński2016-03-101-0/+7
| | | | | | |