summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | Merge topic 'findpythoninterp-version-detection'David Cole2012-03-021-16/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7d6db93 FindPythonInterp: rework the version detection
| * | | | FindPythonInterp: rework the version detectionRolf Eike Beer2012-02-271-16/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are versions out there that neither understand --version nor -V. Try a completely different approach: execute a small python script that prints the version number (and only that) in an easily reusable way using sys.version_info. This is documented to work since Python 2.0. Use sys.version for older versions, which is documented to exist since 1.5. If even that doesn't work then simply assume we are on 1.4.0.
* | | | | Merge topic 'simplify-GetRealDependency'David Cole2012-03-021-9/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4f6fd96 Drop if(...) check because condition is always true
| * | | | | Drop if(...) check because condition is always trueYury G. Kudryashov2012-02-271-9/+2
| | |_|/ / | |/| | | | | | | | | | | | | GetLocation returns std::string::c_str() which is never NULL
* | | | | Merge topic 'fix-findimagemagick-no-components'David Cole2012-03-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 518f965 FindImageMagick: fix fail if no components were given
| * | | | | FindImageMagick: fix fail if no components were givenRolf Eike Beer2012-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The variable name should be added to the list here, not the content.
* | | | | | Merge topic 'escape-test-pass-regex'David Cole2012-03-021-2/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5cf8f9 Tests: Escape metachars before embedding paths into the regex (#12999)
| * | | | | | Tests: Escape metachars before embedding paths into the regex (#12999)Modestas Vainius2012-02-271-2/+9
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ${CMake_SOURCE_DIR} and ${CMake_BINARY_DIR} cannot be embedded into regex directly. If they contain special regex metacharacters like +, the regex will break. So just escape such metacharacters with a backslash before embedding the path into the regex. The issue affected the following tests: CTestTestConfigFileInBuildDir1 and CTestTestConfigFileInBuildDir2.
* | | | | | Merge topic 'fix-BORLAND-doc-typo'David Cole2012-03-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5edfc4 Fix typo in documentation
| * | | | | | Fix typo in documentationYury G. Kudryashov2012-02-271-1/+1
| |/ / / / /
* | | | | | Merge topic 'CPack-fixPackageMaker-doc'David Cole2012-03-021-12/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ace342 Typo: Add missing ##end for ##module c895062 Update CPack PackageMaker variable doc layout
| * | | | | | Typo: Add missing ##end for ##moduleEric NOULARD2012-02-251-0/+1
| | | | | | |
| * | | | | | Update CPack PackageMaker variable doc layoutEric NOULARD2012-02-251-12/+12
| | | | | | |
* | | | | | | Merge topic 'CPack-cygwinGeneratorDoc'David Cole2012-03-021-0/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98d1583 Provide template for CPack Cygwin generator specific variables.
| * | | | | | | Provide template for CPack Cygwin generator specific variables.Eric NOULARD2012-02-251-0/+33
| |/ / / / / /
* | | | | | | Merge topic 'CPack-updateCommonDoc'David Cole2012-03-023-111/+170
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ad0f04 Update CPackConfig template. 94a2693 Review and update CPack variable documentation.
| * | | | | | | Update CPackConfig template.Eric NOULARD2012-02-251-25/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove variable documentation from the template in order to avoid multiple location for doc update. Users can now retrieve CPACK_xxx variable documentation from the command line.
| * | | | | | | Review and update CPack variable documentation.Eric NOULARD2012-02-252-86/+162
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This concerns all variables common to all CPack generators. Variables mainly used and/or set in CPack.cmake are documented therein. C++ built-in variables are documented in cmCPackDocumentVariables.cxx.
* | | | | | | Merge topic 'CPack-fixCPackDMG-docLayout'David Cole2012-03-021-29/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3851f5 Fix CPack Drag and Drop generator documentation layout.
| * | | | | | | Fix CPack Drag and Drop generator documentation layout.Eric NOULARD2012-02-251-29/+29
| |/ / / / / /
* | | | | | | Merge topic 'CPack-fixCPackBundleDocLayout'David Cole2012-03-021-15/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4849e6a Fix layout of the CPack Bundle documentation
| * | | | | | | Fix layout of the CPack Bundle documentationEric NOULARD2012-02-251-15/+14
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPACK_BUNDLE_STARTUP_SCRIPT was in fact CPACK_BUNDLE_STARTUP_COMMAND in the C++ code. The doc has been changed accordingly.
* | | | | | | Merge topic 'fix-macos-findprogramm-crash'David Cole2012-03-021-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d2f5c8 Fix crash if app bundle executeable couldn't be found
| * | | | | | | Fix crash if app bundle executeable couldn't be foundBjoern Ricks2012-02-251-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a crash on Mac OS X if a programm can't be found as an application bundle. CFRelease MUST NOT be called on a NULL value. See https://developer.apple.com/library/mac/documentation/CoreFOundation/Reference/CFTypeRef/Reference/reference.html#//apple_ref/doc/c_ref/CFRelease
* | | | | | | Merge topic 'fix-findhspell-version'David Cole2012-03-021-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 213eb6e FindHSPELL: set HSPELL_VERSION_STRING
| * | | | | | | FindHSPELL: set HSPELL_VERSION_STRINGRolf Eike Beer2012-02-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable was documented, but never set.
* | | | | | | | Merge topic 'remove-old-manpage'David Cole2012-03-021-112/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b2cbd75 Remove unused file cmake.1
| * | | | | | | | Remove unused file cmake.1Yury G. Kudryashov2012-02-241-112/+0
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | This old man page has long been replaced by generated documentation.
* | | | | | | | Merge topic 'improve-findopenscenegraph'David Cole2012-03-021-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ffdaa47 FindOpenSceneGraph: give every message() with an explicit level
| * | | | | | | | FindOpenSceneGraph: give every message() with an explicit levelRolf Eike Beer2012-02-241-5/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'cmake-mode-case'David Cole2012-03-021-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab9824e cmake-mode.el: Make indentation case-insensitive (#12995)
| * | | | | | | | cmake-mode.el: Make indentation case-insensitive (#12995)Christopher Sean Morrison2012-02-241-2/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the block open and close matching expressions to be explicitly insensitive to case. This way it will not matter whether Emacs is sensitive to case when evaluating 'string-match'.
generated by cgit v0.12 at 2025-01-23 00:30:56 (GMT)