summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* KWSys Nightly Date StampKWSys Robot2012-03-051-1/+1
|
* KWSys Nightly Date StampKWSys Robot2012-03-041-1/+1
|
* KWSys Nightly Date StampKWSys Robot2012-03-031-1/+1
|
* Merge topic 'while-testing'David Cole2012-03-029-5/+74
|\ | | | | | | | | | | 944b90b add testcases for while()/endwhile() errors f605b92 improve error message on a stray "endwhile()"
| * add testcases for while()/endwhile() errorsRolf Eike Beer2012-03-017-0/+60
| |
| * improve error message on a stray "endwhile()"Rolf Eike Beer2012-03-012-5/+14
| |
* | Merge topic 'allfindmodules-versions'David Cole2012-03-021-18/+24
|\ \ | | | | | | | | | | | | 9271d2f AllFindModules test: once again expand version checking
| * | AllFindModules test: once again expand version checkingRolf Eike Beer2012-03-011-18/+24
| | |
* | | Merge topic 'doxygen-fixes'David Cole2012-03-0211-147/+121
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09ff226 Merge branch 'add-const-qualifiers' into doxygen-fixes 31ab25c doxygen: MathCommand is not about string operators 486033a doxygen: review cmake.h 937bb4b doxygen: remove a few comments 4774590 doxygen: fix some comments in cmPolicies.h 4a48be3 doxygen: Small fixes in cmake.h apidocs 1e5b971 doxygen: Use proper syntax to document enum 54ab11c doxygen: Improve API docs of GetRealDependency 80072d4 doxygen: cmPropertyDefinition
| * \ \ Merge branch 'add-const-qualifiers' into doxygen-fixesBrad King2012-03-01117-421/+421
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: Source/cmPropertyDefinition.h
| * | | | doxygen: MathCommand is not about string operatorsYury G. Kudryashov2012-02-291-4/+1
| | | | |
| * | | | doxygen: review cmake.hYury G. Kudryashov2012-02-291-28/+24
| | | | | | | | | | | | | | | | | | | | | | | | | * Move top-level comment to class apidocs * Remove misleading comment
| * | | | doxygen: remove a few commentsYury G. Kudryashov2012-02-296-55/+5
| | | | | | | | | | | | | | | | | | | | | | | | | These comments were either wrong or non-informative. Replace some of them by brief comments
| * | | | doxygen: fix some comments in cmPolicies.hYury G. Kudryashov2012-02-291-24/+39
| | | | |
| * | | | doxygen: Small fixes in cmake.h apidocsYury G. Kudryashov2012-02-281-3/+2
| | | | |
| * | | | doxygen: Use proper syntax to document enumYury G. Kudryashov2012-02-281-12/+15
| | | | |
| * | | | doxygen: Improve API docs of GetRealDependencyYury G. Kudryashov2012-02-281-9/+12
| | | | | | | | | | | | | | | | | | | | Use list instead of sequence of sentences in one paragraph.
| * | | | doxygen: cmPropertyDefinitionYury G. Kudryashov2012-02-281-12/+23
| | |/ / | |/| |
* | | | Merge topic 'add-const-qualifiers'David Cole2012-03-02117-421/+421
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | 737c49a Add 'const' qualifier to some cmCommand members 261491f cmPropertyDefinition::IsChained is const
| * | | Add 'const' qualifier to some cmCommand membersYury G. Kudryashov2012-02-29116-420/+420
| | | | | | | | | | | | | | | | | | | | Use const_cast for the special case in cmFindBase where GetFullDocumentation calls GenerateDocumentation.
| * | | cmPropertyDefinition::IsChained is constYury G. Kudryashov2012-02-241-1/+1
| |/ /
* | | Merge topic 'bootstrap-msys-paths'David Cole2012-03-021-4/+14
|\ \ \ | | | | | | | | | | | | | | | | 5cd879c bootstrap: Convert MSYS paths to Windows format (#13001)
| * | | bootstrap: Convert MSYS paths to Windows format (#13001)Brad King2012-03-011-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We set CMAKE_PREFIX_PATH from the --prefix= option. The calling shell might not translate "/c/..." to "c:/..." paths but we need to store Windows paths in CMake cache variables. Pass the specified path through the MSYS shell in a form it will convert to a Windows path using the MSYS fstab. Some MSYS bash implementations leave trailing space on the command line to 'cmd /c echo ...' after quoting the message. The Windows echo tool preserves both the quotes and the trailing space. Use a sed expression that strips quotes and trailing spaces after the end quote.
* | | | Merge topic 'inject_code_via_variable'David Cole2012-03-026-2/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 2557a08 Fix typo in error message, and remove redundent test. 9090572 Add ability to include a file in a project via a cache variable.
| * | | | Fix typo in error message, and remove redundent test.Bill Hoffman2012-03-012-3/+1
| | | | |
| * | | | Add ability to include a file in a project via a cache variable.Bill Hoffman2012-02-176-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a variable exists called CMAKE_PROJECT_<projectName>_INCLUDE, the file pointed to by that variable will be included as the last step of the project command.
* | | | | Merge topic 'run-vim-spellcheck'David Cole2012-03-027-22/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 43d6011 Run vim spellcheck on some files
| * | | | | Run vim spellcheck on some filesYury G. Kudryashov2012-02-297-22/+24
| | |_|/ / | |/| | |
* | | | | Merge topic 'document-missing-versions'David Cole2012-03-022-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 95f5094 document when version detection will not work
| * | | | | document when version detection will not workRolf Eike Beer2012-02-292-0/+4
| | | | | |
* | | | | | Merge topic 'dragndrop-sla'David Cole2012-03-021-5/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5663e43 DragNDrop: Fix problem with relocated files in Xcode 4.3
| * | | | | | DragNDrop: Fix problem with relocated files in Xcode 4.3Clinton Stimpson2012-02-291-5/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dependency on /Developer/Headers/FlatCarbon when creating SLAs for DMG images. Instead, of adding those .r files on the command line, include the necessary .r files from the generated .r file.
* | | | | | Merge topic 'find_package-improve-messages'David Cole2012-03-0234-72/+532
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eeaaffc find_package: Test error and warning messages in failure cases 52dffb9 Merge branch 'test-CMakeCommands' into find_package-improve-messages d365104 find_package: Optionally warn when implicitly using Config mode 31ead5f find_package: Reject mixed use of MODULE- and CONFIG-only options 6d83083 find_package: mention requested version number in error message 9c39bbd find_package: add CONFIG mode keyword alias for NO_MODULE f310f67 find_package: add MODULE mode to use only Find-modules 7d67dcf find_package: improve error message when no Find module is present 978d89b find_package: rename NoModule to UseFindModules
| * | | | | | find_package: Test error and warning messages in failure casesBrad King2012-02-2831-0/+318
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a "CMakeCommands.find_package" test to run CMake on a bunch of cases in which find_package fails. Check that the process return code and warning/error messages are as expected. Record expected test output in corresponding files for reference by the check. These files will also serve as a reference for the message text in each case.
| * | | | | | Merge branch 'test-CMakeCommands' into find_package-improve-messagesBrad King2012-02-283-7/+11
| |\ \ \ \ \ \
| * | | | | | | find_package: Optionally warn when implicitly using Config modeBrad King2012-02-283-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define variable CMAKE_FIND_PACKAGE_WARN_NO_MODULE for use by a project that wants to use an explicit mode in every call to find_package in order to generate more specific failure messages. Word the warning using the new CONFIG and MODULE mode keywords when the minimum required version of CMake is new enough to have them. Otherwise word the warning using the old NO_MODULE mode keyword. Inspired-by: Alex Neundorf <neundorf@kde.org>
| * | | | | | | find_package: Reject mixed use of MODULE- and CONFIG-only optionsBrad King2012-02-281-43/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many options imply exclusive Config mode. The new MODULE option implies exclusive Module mode. Do not allow mixed combinations.
| * | | | | | | find_package: mention requested version number in error messageAlex Neundorf2012-02-281-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When neither a Find-module or a config file can be found print the required version so the user knows which version of the package to install.
| * | | | | | | find_package: add CONFIG mode keyword alias for NO_MODULEAlex Neundorf2012-02-281-4/+21
| | | | | | | |
| * | | | | | | find_package: add MODULE mode to use only Find-modulesAlex Neundorf2012-02-282-56/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new mode differ from default mode in that that it doesn't fallback to config mode. The default mode stays unchanged.
| * | | | | | | find_package: improve error message when no Find module is presentAlex Neundorf2012-02-281-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain exactly why CMake is looking for a package configuration file and who is expected to provide what: CMake Error at CMakeLists.txt:7 (find_package): By not providing "Find<pkg>.cmake" in CMAKE_MODULE_PATH the caller has asked CMake to find a package configuration file provided by "<pkg>", but CMake did not find one. Could not find a package configuration file provided by "<pkg>" with any of the names: <pkg>Config.cmake <pkg>-config.cmake Add the installation prefix of "<pkg>" to CMAKE_PREFIX_PATH or set "<pkg>_DIR" to a directory containing one of the above files. If "<pkg>" provides separate development package or SDK be sure it has been installed. The first paragraph explains how CMake is interpreting the intention of the caller. This puts the blame or credit at the call site in the project code where it belongs both when it is a bug and when it is intentional. It can be dropped in NO_MODULE mode. Suggested-by: Brad King <brad.king@kitware.com>
| * | | | | | | find_package: rename NoModule to UseFindModulesAlex Neundorf2012-02-272-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...positive logic is easier to handle Alex
* | | | | | | | Merge topic 'test-CMakeCommands'David Cole2012-03-023-7/+11
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | 5e1a5c4 Add infrastructure for CMakeCommands tests
| * | | | | | | Add infrastructure for CMakeCommands testsBrad King2012-02-283-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize the build_command test framework as a macro to add the test. Process the CMakeCommands subdirectory explicitly.
* | | | | | | | Merge topic 'find_package-report-CONFIGS-error'David Cole2012-03-021-0/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | b3f9fe4 find_package: print error if an invalid CONFIGS name is used
| * | | | | | | find_package: print error if an invalid CONFIGS name is usedAlex Neundorf2012-02-271-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 41c2895b (Added version support to Config mode of find_package command, 2008-01-28) the error message was computed but was not reported. Add the SetError call to report it.
* | | | | | | Merge topic 'fix-FindPackageMode-symlink'David Cole2012-03-021-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b86388 CMakeFindPackageMode: fix 32/64bit detection if 'file' is a symlink
| * | | | | | | CMakeFindPackageMode: fix 32/64bit detection if 'file' is a symlinkYury G. Kudryashov2012-02-281-1/+2
| | | | | | | |
* | | | | | | | Merge topic 'factor-install-type'David Cole2012-03-0213-70/+81
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 573fa3b Factor cmInstallType out of cmTarget::TargetType
| * | | | | | | | Factor cmInstallType out of cmTarget::TargetTypeBrad King2012-02-2713-70/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of the TargetType enumeration was overloaded for install type because install rules were once recorded as targets. Factor the install types out into their own enumeration.