summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* project: Manage VERSION variablesBrad King2014-01-2943-2/+401
| | | | | | | | | | | | | | | | Teach the project() command to set variables {PROJECT,<PROJECT-NAME>}_VERSION{,_MAJOR,_MINOR,_PATCH,_TWEAK} holding the project version number and its components. Add project() command option "VERSION" to specify the version explicitly, and default to the empty string when it is not given. Since this clears variables when no VERSION is given, this may change behavior for existing projects that set the version variables themselves prior to calling project(). Add policy CMP0048 for compatibility. Suggested-by: Alex Neundorf <neundorf@kde.org>
* project: Add optional LANGUAGES keywordBrad King2014-01-2914-5/+53
| | | | | | | Teach the project() command to recognize an optional "LANGUAGES" keyword after the project name and prior to the list of languages. Do not allow multiple copies of the keyword. If the keyword is specified and no languages are listed, imply NONE.
* Help: Format project command and variable documentationBrad King2014-01-298-28/+39
| | | | Also add document for CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE variable.
* Merge branch 'release'Brad King2014-01-281-0/+17
|\
| * CMake 2.8.12.2v2.8.12.2Brad King2014-01-162-1/+18
| |
| * Merge branch 'ninja_fix_rerun' into releaseBrad King2014-01-151-3/+0
| |\
| * \ Merge branch 'vs10-include-backslashes' into releaseBrad King2014-01-091-1/+3
| |\ \
| * \ \ Merge branch 'xcode-storyboard-file-type-2.8.12' into releaseBrad King2014-01-091-2/+4
| |\ \ \
| * \ \ \ Merge branch 'fix-compile-OBJECT_DIR' into releaseBrad King2014-01-064-16/+12
| |\ \ \ \
| * \ \ \ \ Merge branch 'xcode-5.1' into releaseBrad King2014-01-061-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'vs9-map-Fd' into releaseBrad King2014-01-061-0/+2
| |\ \ \ \ \ \
* | | | | | | | CMake Nightly Date StampKitware Robot2014-01-281-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'disallowed-cxx-subset'Brad King2014-01-271-4/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed632736 Help: Note that std::string::clear may not be used. cc04bb6c Help: Document non-use of std::set::insert.
| * | | | | | | | Help: Note that std::string::clear may not be used.Stephen Kelly2014-01-271-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As found in commit 519c0a5d (Can't use std::string::clear() in cmake., 2012-09-15).
| * | | | | | | | Help: Document non-use of std::set::insert.Stephen Kelly2014-01-271-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As found in commit 8e7c207e (Use a manual loop to insert into set::set., 2012-09-15).
* | | | | | | | | Merge topic 'constify'Brad King2014-01-2715-141/+137
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bde0dab1 cmMakefile: Make ConfigureString const. bf1e1bf1 cmMakefile: Make FindSourceGroup const. 01d7ceda cmMakefile: Trivially constify some methods. 9073318f cmMakefile: Remove non-const version of method 9b05bc4f cmMakefile: Remove method declarations with no implementation. c6c0bd9d cmMakefile: Consify custom command API. d6d4eaac cmMakefile: Constify policies accessors. 2a6e56e0 cmCacheManager: Consify version accessors. 5cc9fb02 cmSourceGroup: Fix method name capitalization. fe8b0330 cmMakefile: Constify some cmSourceGroup related code. e68a3ead cmSourceFile: Use a const cmMakefile. b6292402 cmSourceFileLocation: Use a const cmMakefile. b33ea578 cmMakefile: Make GetProperty const.
| * | | | | | | | | cmMakefile: Make ConfigureString const.Stephen Kelly2014-01-222-4/+4
| | | | | | | | | |
| * | | | | | | | | cmMakefile: Make FindSourceGroup const.Stephen Kelly2014-01-227-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a pointer instead of a reference. This allows making the accessor const with the least impact.
| * | | | | | | | | cmMakefile: Trivially constify some methods.Stephen Kelly2014-01-222-51/+51
| | | | | | | | | |
| * | | | | | | | | cmMakefile: Remove non-const version of methodStephen Kelly2014-01-221-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The const version suffices.
| * | | | | | | | | cmMakefile: Remove method declarations with no implementation.Stephen Kelly2014-01-221-2/+0
| | | | | | | | | |
| * | | | | | | | | cmMakefile: Consify custom command API.Stephen Kelly2014-01-224-4/+4
| | | | | | | | | |
| * | | | | | | | | cmMakefile: Constify policies accessors.Stephen Kelly2014-01-222-7/+8
| | | | | | | | | |
| * | | | | | | | | cmCacheManager: Consify version accessors.Stephen Kelly2014-01-223-6/+8
| | | | | | | | | |
| * | | | | | | | | cmSourceGroup: Fix method name capitalization.Stephen Kelly2014-01-223-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adhere to the dominant style.
| * | | | | | | | | cmMakefile: Constify some cmSourceGroup related code.Stephen Kelly2014-01-224-11/+12
| | | | | | | | | |
| * | | | | | | | | cmSourceFile: Use a const cmMakefile.Stephen Kelly2014-01-221-5/+5
| | | | | | | | | |
| * | | | | | | | | cmSourceFileLocation: Use a const cmMakefile.Stephen Kelly2014-01-222-6/+6
| | | | | | | | | |
| * | | | | | | | | cmMakefile: Make GetProperty const.Stephen Kelly2014-01-222-15/+16
| | | | | | | | | |
* | | | | | | | | | Merge topic 'ctest-update-p4-unknown-revision'Brad King2014-01-272-27/+38
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 243cfc2f ctest_update: Handle P4 unknown revisions more robustly
| * | | | | | | | | | ctest_update: Handle P4 unknown revisions more robustlyPedro Navarro2014-01-222-27/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark unknown revisions as such and fail instead of reporting revision 0. Otherwise CTest reports massive file updates between revisions when the server timeouts while trying to fetch the current revision number.
* | | | | | | | | | | Merge topic 'ninja-normalize-cmake-rerun-deps'Brad King2014-01-271-6/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c426bfb Ninja: Normalize paths of CMake re-run rule dependencies
| * | | | | | | | | | | Ninja: Normalize paths of CMake re-run rule dependenciesBrad King2014-01-211-6/+14
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send all implicit dependencies through ConvertToNinjaPath. Add CMakeCache.txt before uniquifying the list.
* | | | | | | | | | | Merge topic 'robust-ep-download-verify'Brad King2014-01-275-7/+56
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a432b93b file DOWNLOAD: Display the curl result status when a hash mismatch occurs. 1cb9ef81 file DOWNLOAD: Test non-zero return status. f73f0fb3 file DOWNLOAD: Add test for bad hash. b5e2265f ExternalProject: Reattempt download when verification fails.
| * | | | | | | | | | | file DOWNLOAD: Display the curl result status when a hash mismatch occurs.Matt McCormick2014-01-161-0/+2
| | | | | | | | | | | |
| * | | | | | | | | | | file DOWNLOAD: Test non-zero return status.Matt McCormick2014-01-161-0/+13
| | | | | | | | | | | |
| * | | | | | | | | | | file DOWNLOAD: Add test for bad hash.Matt McCormick2014-01-162-0/+14
| | | | | | | | | | | |
| * | | | | | | | | | | ExternalProject: Reattempt download when verification fails.Matt McCormick2014-01-151-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When downloading an URL with ExternalProject, reattempt the download three times if the file hash verification fails. The re-attempt is limited to non-local URL's. The same download CMake script is re-used after removing any file that resulted from the previous download attempt. Up to three re-attempts are performed.
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2014-01-271-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2014-01-261-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2014-01-251-1/+1
| |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2014-01-241-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2014-01-231-1/+1
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'cmake-rerun-depends'Brad King2014-01-2210-0/+87
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82d43175 Allow projects to specify extra inputs to CMake 1ef444d6 Add test case to verify CMake does not re-run on first build
| * | | | | | | | | | Allow projects to specify extra inputs to CMakeBrad King2014-01-2110-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define a new 'CMAKE_CONFIGURE_DEPENDS' directory property that projects can use to specify input files to the CMake configuration process. Extend the RunCMake.Configure test to verify that the build system re-runs CMake when this input changes.
| * | | | | | | | | | Add test case to verify CMake does not re-run on first buildBrad King2014-01-213-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the RunCMake.Configure with a case to verify that the CMake configuration process does not immediately re-run the first time that the generated build system is invoked.
* | | | | | | | | | | Merge topic 'cmake-E-sleep'Brad King2014-01-229-1/+41
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94389f63 cmake: Add '-E sleep' command
| * | | | | | | | | | cmake: Add '-E sleep' commandBrad King2014-01-219-1/+41
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a cmake command-line interface to provide a cross-platform 'sleep'.
* | | | | | | | | | Merge topic 'qcc-id'Brad King2014-01-2215-27/+117
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e00db59d QNX: Introduce QCC compiler id for that QNX platform compiler. d2dea79b CMakeDetermine*Compiler: Fix typo 'lile' => 'like'
| * | | | | | | | | | QNX: Introduce QCC compiler id for that QNX platform compiler.Stephen Kelly2014-01-2211-23/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce policy CMP0047 to control resetting the id for compatibility. De-duplicate content in the QNX platform file by including the GNU one. QNX is a form of GNU platform. Do not clear CMAKE_SHARED_LIBRARY_${lang}_FLAGS variables. They are populated again later by the Compiler/GNU.cmake file anyway. Modify the CMAKE_CXX_COMPILE_OBJECT variable only when the QCC compiler id is in use, and the language is CXX. Use the QNX recommended flag for QCC instead of the gcc compatible -x flag. Populate new module files to handle system includes and depfiles when using the QCC compiler. Remove code which unsets the system include and depfiles related variables. When a GNU driver is used instead of the QCC one, the appropriate flags will be used. These variables were previously cleared for lowest-common-denominator compatibility with both drivers.