summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'minor-cleanups'Brad King2014-02-196-7/+6
|\ | | | | | | | | | | | | | | | | | | f6cae4ea Tests: Remove some trailing black lines. c0ea4c5c Makefile: Fix comment indentation. 5e0c73c7 cmGlobalGenerator: Remove unused variable. 907c09cd include_directory: Add missing include. a74d125a Help: Fix typo 317d8498 Small typo fix
| * Tests: Remove some trailing black lines.Stephen Kelly2014-02-171-2/+0
| |
| * Makefile: Fix comment indentation.Stephen Kelly2014-02-171-1/+1
| |
| * cmGlobalGenerator: Remove unused variable.Stephen Kelly2014-02-171-1/+0
| |
| * include_directory: Add missing include.Stephen Kelly2014-02-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | The cmGeneratorExpression is used here, but the header for it is not in the include heirarchy. This would be a compile error if the file were compiled as a standalone translation unit, but it is instead used in a mini-unity-build by inclusion in cmCommands.cxx. The header for cmGeneratorExpression happens to be included first, so the compilation works fine. IDEs do not know this however, and flag the use as an error.
| * Help: Fix typoStephen Kelly2014-02-171-2/+2
| | | | | | | | binary_find -> binary_search.
| * Small typo fixKevin Funk2014-02-171-1/+1
| |
* | CMake Nightly Date StampKitware Robot2014-02-191-1/+1
| |
* | CMake Nightly Date StampKitware Robot2014-02-181-1/+1
| |
* | Merge topic 'windows-filesystem-retry-config'Brad King2014-02-173-8/+60
|\ \ | | | | | | | | | | | | 7b1f966a Windows: Make file delete/rename retry configurable
| * | Windows: Make file delete/rename retry configurableBrad King2014-02-123-8/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several CMake operations need to replace files in rapid succession. This commonly fails on Windows due to filesystem lock behavior so we have retry loops. No matter how many times we retry or how long we delay there will inevitably be someone with an environment that needs more. Make the retry count and delay configurable in the Windows Registry keys: {HKCU,HKLM}/Software/Kitware/CMake/Config in DWORD values FilesystemRetryCount = Number of tries FilesystemRetryDelay = Delay in milliseconds between tries Leave the feature undocumented for now to see how it goes.
* | | Merge topic 'INTERFACE-no-sources'Brad King2014-02-173-5/+10
|\ \ \ | | | | | | | | | | | | | | | | 9db9c1fc cmTarget: Don't try to get sources of an INTERFACE_LIBRARY.
| * | | cmTarget: Don't try to get sources of an INTERFACE_LIBRARY.Stephen Kelly2014-02-143-5/+10
| | | | | | | | | | | | | | | | An an assert to ensure this.
* | | | Merge topic 'emacs-mode-cmake-help'Brad King2014-02-171-19/+84
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 9d35f7c4 cmake-mode.el: Add help for variables/properties/complete. Factorize. 7cc21e9a cmake-mode.el: Add the ability to retrieve module help.
| * | | | cmake-mode.el: Add help for variables/properties/complete. Factorize.Philipp Möller2014-02-131-47/+81
| | | | |
| * | | | cmake-mode.el: Add the ability to retrieve module help.Philipp Möller2014-02-131-0/+31
| | | | |
* | | | | Merge topic 'KateHandleSpacesInPath'Brad King2014-02-172-10/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 22e5c6c2 Kate: handle spaces in build dir
| * | | | | Kate: handle spaces in build dirAlex Neundorf2014-02-172-10/+9
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They need to be escaped in the json file... I'm quite sure I tested this before, obviously I didn't test it correctly. Alex
* | | | | Merge topic 'isystemForIcpc'Brad King2014-02-172-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cab5ebd4 Intel compiler: add -isystem flag under Linux
| * | | | | Intel compiler: add -isystem flag under LinuxAlex Neundorf2014-02-062-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the SYSTEM keyword work with the Intel compiler under Linux. AFAIK this is supported neither under Windows nor OSX. Alex
* | | | | | CMake Nightly Date StampKitware Robot2014-02-171-1/+1
| |/ / / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2014-02-161-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-02-151-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-02-141-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'dev/ninja-speedup'Brad King2014-02-132-43/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 26762e16 Ninja: Cache target-level flags
| * | | | Ninja: Cache target-level flagsBen Boeckel2014-02-132-43/+51
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Instead of figuring out target flags per-source file, cache the flags that are being used. This results in a *much* faster generate time for Ninja.
* | | | Merge topic 'osx-sysroot-escape'Brad King2014-02-131-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | 77b2e6f1 OS X: Escape path given to -isysroot flag
| * | | OS X: Escape path given to -isysroot flagBrad King2014-02-121-1/+1
| |/ / | | | | | | | | | | | | Ensure that paths containing spaces or other special characters are escaped correctly on the command line.
* | | CMake Nightly Date StampKitware Robot2014-02-131-1/+1
| | |
* | | Merge topic 'backward-compatibility'Brad King2014-02-1234-0/+250
|\ \ \ | | | | | | | | | | | | | | | | | | | | f2eee72f add_custom_command: Disallow use of SOURCE signatures. c248a437 Add policy CMP0049 to avoid variable expansion in source lists
| * | | add_custom_command: Disallow use of SOURCE signatures.Stephen Kelly2014-02-1220-0/+133
| | | | | | | | | | | | | | | | Add CMP0050 to control this behavior.
| * | | Add policy CMP0049 to avoid variable expansion in source listsStephen Kelly2014-02-1219-0/+117
| | | |
* | | | Merge topic 'dev/fix-sublime-compile-flags'Brad King2014-02-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2d9f93ab Sublime: Pass language and config properly
| * | | | Sublime: Pass language and config properlyBen Boeckel2014-02-111-1/+1
| |/ / /
* | | | Merge topic 'cmake-devel-version-macro'Brad King2014-02-123-15/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6ca6613a Export: Use the CMAKE_DEVEL_VERSION macro for build-export files.
| * | | | Export: Use the CMAKE_DEVEL_VERSION macro for build-export files.Stephen Kelly2014-02-113-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | Move the macro definition to the cmExportBuildFileGenerator.h header to share it.
* | | | | Merge topic 'osx-intel-info-split'Brad King2014-02-126-134/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3693c63f OS X: Split Intel compiler information files
| * | | | | OS X: Split Intel compiler information filesBrad King2014-02-116-134/+36
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create platform information modules Platform/Darwin-Intel-(C|CXX).cmake and helper module Platform/Darwin-Intel.cmake. Teach existing module Platform/Darwin-Intel-Fortran.cmake to use the helper too. Move information from Platform/Darwin-icc.cmake into these files and drop information already in Platform/Darwin.cmake to avoid duplication.
* | | | | Merge topic 'FindBoost-MPI-hints'Brad King2014-02-121-4/+31
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | a22eeca3 FindBoost: Search next to MPI libraries for boost_mpi (#14739)
| * | | | FindBoost: Search next to MPI libraries for boost_mpi (#14739)Brad King2014-02-101-4/+31
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some distributions place boost_mpi next to the MPI libraries against which it was built instead of next to the other Boost libraries. If find_package(MPI) has already been run prior to find_package(Boost) then MPI_CXX_LIBRARIES or MPI_C_LIBRARIES may be set to the location of the MPI libraries. Teach FindBoost.cmake to look there for boost_mpi and boost_mpi_python after looking next to the other Boost libraries but not consider the location to be Boost_LIBRARY_DIR.
* | | | CMake Nightly Date StampKitware Robot2014-02-121-1/+1
| |/ / |/| |
* | | Merge topic 'cmake-devel-version-macro'Brad King2014-02-118-11/+36
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 9bcc1b21 Export: Fix internal CMake version test logic d2059d25 cmVersion: Fix CMake_VERSION_ENCODE for date in patch level 28805109 cmStandardIncludes: Include cmIML/INT.h for portable integer types
| * | Export: Fix internal CMake version test logicBrad King2014-02-101-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the internal DEVEL_CMAKE_VERSION macro to use CMake_VERSION_ENCODE to compare version component-wise. Otherwise an old invocation of the macro may be tricked into using the current version when the requested major version is smaller than the current version but the requested minor version is larger. It should use the requested (old) version in that case.
| * | cmVersion: Fix CMake_VERSION_ENCODE for date in patch levelBrad King2014-02-105-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use a uint64_t to store encoded version numbers so we have plenty of bits available. Encode with room for up to 1000 minor releases between major releases and to encode dates until the year 10000 in the patch level. This is necessary because CMake development versions prior to release 2.8.0 used the date in the patch level, and this practice may be restored after the 3.0 release.
| * | cmStandardIncludes: Include cmIML/INT.h for portable integer typesBrad King2014-02-102-0/+18
| | | | | | | | | | | | Also teach the bootstrap script to configure the needed headers.
* | | Merge topic 'release-notes-3.0'Brad King2014-02-112-0/+453
|\ \ \ | | | | | | | | | | | | | | | | 10f90d64 Help: Add CMake 3.0 Release Notes
| * | | Help: Add CMake 3.0 Release NotesBrad King2014-02-112-0/+453
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually read through version control history since the 2.8.12.2 release and write release notes for important user-facing changes. Co-Author: Stephen Kelly <steveire@gmail.com>
* | | | Merge topic 'backward-compatibility'Brad King2014-02-111-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 37e1894d cmTarget: Remove TODO comment.
| * | | | cmTarget: Remove TODO comment.Stephen Kelly2014-02-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The current behavior is desirable because while it is common to set a per-config suffix on libraries, it is not common for exexutables.
* | | | | Merge topic 'eclipse-hotfix'Brad King2014-02-111-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 311c0b98 Eclipse: Skip generator expressions in COMPILE_DEFINITIONS (#14722)