summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmTarget: Don't create duplicate backtraces in CMP0046 warningStephen Kelly2014-03-126-4/+31
|
* Merge branch 'fix-find_dependency-EXACT' into releaseBrad King2014-03-121-3/+3
|\
| * find_dependency: Make sure invalid EXACT use can be reported.Stephen Kelly2014-03-111-3/+3
| | | | | | | | | | | | Test the first argument directly for matching 'EXACT'. The error check in its previous position was incorrect and would only trigger with a version of '0' or similar.
* | Merge branch 'fix-xcode-compiler-force' into releaseBrad King2014-03-115-92/+37
|\ \ | |/ |/|
| * Xcode: Convert forced CMAKE_<LANG>_COMPILER to full path if possibleBrad King2014-03-103-0/+3
| | | | | | | | | | | | | | During cross-compiling the toolchain file may use CMakeForceCompiler to force a compiler setting. When using the Xcode generator try to convert it to a full path by searching the PATH as is done for the Makefile generators.
| * CMakeDetermine*Compiler: Factor out search for compiler in PATHBrad King2014-03-105-92/+34
| | | | | | | | | | Factor out a _cmake_find_compiler_path helper macro to avoid duplication of the search for a full path to the compiler.
* | Merge branch 'doc-osx-path-variables' into releaseBrad King2014-03-103-0/+13
|\ \
| * | Help: Document variables CMAKE_APPBUNDLE_PATH and CMAKE_FRAMEWORK_PATHBrad King2014-03-103-0/+13
| |/
* | Merge branch 'fix-AUTOGEN-custom-command-depends' into releaseBrad King2014-03-104-3/+36
|\ \
| * | QtAutogen: Fix AUTOGEN depends on custom command output with VS.Stephen Kelly2014-03-104-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | Visual Studio is handled as a special case for autogen depends. However, the special handling works only for target dependencies, not file dependencies output by a custom command. Use a PRE_BUILD step only if all depends are targets.
* | | Merge branch 'fix-find_dependency-EXACT' into releaseBrad King2014-03-101-2/+11
|\ \ \
| * | | find_dependency: Don't propagate EXACT argument.Stephen Kelly2014-03-061-2/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | If a package is requested with an EXACT version, that doesn't imply that dependencies must be found EXACTly too. Extend the macro to allow specifying that a dependency must be found by EXACT version instead.
* | | Merge branch 'fix-Qt4-DBus-macro' into releaseBrad King2014-03-101-1/+1
|\ \ \
| * | | Qt4: Use correct qdbus executable in macro.Stephen Kelly2014-03-101-1/+1
| |/ / | | | | | | | | | | | | | | | Commit v3.0.0-rc1~71^2~9 (Qt4: Use IMPORTED executable names with custom commands., 2014-01-24) erroneusly changed this command to use the wrong target.
* | | Merge branch 'python-3.4' into releaseBrad King2014-03-102-2/+2
|\ \ \
| * | | FindPython{Interp,Libs}: Search for Python 3.4.Matt McCormick2014-03-062-2/+2
| | |/ | |/| | | | | | | Python 3.4.0rnc1 was released on 2014-02-20.
* | | Merge branch 'fix-policy-scopes' into releaseBrad King2014-03-1017-17/+23
|\ \ \
| * | | Tests: Simplify and document policy scopes in RunCMake.CMP* testsBrad King2014-03-0610-10/+10
| | | | | | | | | | | | | | | | | | | | Drop unnecessary NO_POLICY_SCOPE options. Document why the remaining options are necessary.
| * | | Record more policies on targets when createdBrad King2014-03-067-7/+13
| |/ / | | | | | | | | | | | | Policies CMP0027, CMP0038, and CMP0046 have per-target meaning so record the policy settings on targets as they are created.
* | | Merge branch 'fix-check-build-system-crash' into releaseBrad King2014-03-041-1/+1
|\ \ \
| * | | cmake: Fix --check-build-system argument count check (#14784)Brad King2014-03-041-1/+1
| |/ / | | | | | | | | | | | | This internal option requires two arguments, not just one. Fix the argument count required to recognize the option.
* | | Merge branch 'doc-find_package-build-paths' into releaseBrad King2014-03-031-0/+1
|\ \ \
| * | | Help: Mention in find_package that cmake-gui step is Windows-only (#14781)Brad King2014-03-031-0/+1
| |/ / | | | | | | | | | | | | | | | | | | Recently used cmake-gui locations are searched only on Windows because the Windows registry is used to record the values. This behavior is historical and may be removed by a policy in the future so rather than implementing it on other platforms simply document the current behavior.
* | | Merge branch 'CMP0043-dir-prop' into releaseBrad King2014-03-031-1/+7
|\ \ \
| * | | CMP0043: Document old and new interfaces for setting directory property.Stephen Kelly2014-03-031-1/+7
| |/ /
* | | Merge branch 'add_definitions-no-genex' into releaseBrad King2014-03-031-4/+2
|\ \ \
| * | | add_definitions: Don't document genex support.Stephen Kelly2014-03-031-4/+2
| |/ / | | | | | | | | | | | | | | | This command does not support generator expressions. The documentation was mistakenly extended to claim it in commit v3.0.0-rc1~60^2~3 (Help: Mark up the buildsystem commands documentation, 2014-02-03).
* | | Merge branch 'FindRuby-2' into releaseBrad King2014-02-282-4/+22
|\ \ \ | |_|/ |/| |
| * | Help: Consolidate FindRuby-2 release notes for 3.0.0Brad King2014-02-282-4/+2
| | |
| * | Help: Add FindRuby-2 topic release notesBrad King2014-02-281-0/+4
| | |
| * | FindRuby: Add support for Ruby 2.0 and 2.1Bas Couwenberg2014-02-281-4/+20
| | | | | | | | | | | | | | | | | | The most significant change since Ruby 1.9 is the changed path of config.h, from RbConfig::CONFIG['rubyhdrdir'] to RbConfig::CONFIG['rubyarchhdrdir'].
* | | Merge branch 'fix-find_dependency-macro' into releasev3.0.0-rc1Brad King2014-02-261-1/+2
|\ \ \
| * | | find_dependency: unset cmake_fd_version variable at end of macroAlex Merry2014-02-261-0/+1
| | | | | | | | | | | | | | | | This matches the other macro variables.
| * | | find_dependency: use correct version variable nameAlex Merry2014-02-261-1/+1
| | | | | | | | | | | | | | | | The code set cmake_fd_version, but used ${version}.
* | | | Merge branch 'INTERFACE-property-docs' into releaseBrad King2014-02-261-0/+10
|\ \ \ \
| * | | | Help: List the whitelist of properties for INTERFACE libraries.Stephen Kelly2014-02-261-0/+10
| | | | |
* | | | | Merge branch 'fix-showinclude-warnings' into releaseBrad King2014-02-262-2/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | CTest: exclude /showIncludes notes when scraping logsNils Gladitz2014-02-252-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My last related commit e5e3f3d4 (CTest: filter /showIncludes output from ninja compile launcher, 2013-12-01) filtered /showIncludes messages from the generated xml output but they also need to be filtered in ScrapeLog(). Otherwise they are being detected as warnings when using compilers withs english diagnostics.
* | | | | Merge branch 'fix-find_dependency-macro' into releaseBrad King2014-02-241-14/+19
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | find_dependency: Ensure that ARGV1 has valid local contentStephen Kelly2014-02-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | The ARGV1 value could come from a wrapping context if find_dependency is called from a function.
| * | | | find_dependency: Add namespacing for variables in the macro.Stephen Kelly2014-02-241-13/+17
| | | | | | | | | | | | | | | | | | | | Avoid setting a variable called 'version' etc.
| * | | | Always set version variable of find_dependency macroAlex Merry2014-02-231-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no ARGV1, that is fine; version will be made empty, and no version will be passed to find_package(). This is relevant when find_dependency is invoked multiple times, sometimes with a version specified and sometimes without. find_dependency(dep1 3.4) find_dependency(dep2) # version still set to 3.4.
* | | | | Merge branch 'install-FILES-genex' into releaseBrad King2014-02-2412-178/+288
|\ \ \ \ \
| * | | | | install: Support generator expressions in FILES and PROGRAMS modeBrad King2014-02-2112-7/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the install(FILES) and install(PROGRAMS) commands to evaluate generator expressions in the list of files. Extend the ExportImport test to cover installation cases involving generator expressions.
| * | | | | cmInstallFilesGenerator: Add reference to calling cmMakefileBrad King2014-02-215-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a Makefile member to the cmInstallFilesGenerator class and populate it on construction. This will be useful in a following change to evaluate generator expressions with proper context.
| * | | | | Help: Format install() command documentationBrad King2014-02-211-161/+162
| | |/ / / | |/| | | | | | | | | | | | | Add inline markup and explicit markup blocks as appropriate.
* | | | | Merge branch 'doc-add_test-cleanup' into releaseBrad King2014-02-201-48/+38
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Help: Revise and format add_test() command documentationBrad King2014-02-201-48/+38
| |/ / / | | | | | | | | | | | | | | | | Favor the add_test(NAME) signature and document the limitations of the plain signature.
* | | | Change version scheme to use only two components for feature levelsBrad King2014-02-1913-42/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Historically CMake used three version components for the feature level. We released new features while incrementing only the third version component. Since commit v2.8.2~105^2~4 (New version scheme to support branchy workflow, 2010-04-23) we used the fourth version component for bug-fix releases and the development date: <major>.<minor>.<patch>[.<tweak>][-rc<n>] = Release <major>.<minor>.<patch>.<date>[-<id>] = Development This solidified use of three components for the feature level, and was necessary to continue releasing 2.x versions because: * Some existing projects performed floating-point comparisons of ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} to 2.x numbers so ``x`` could never be higher than 9. * Version 2.9.<date> was used briefly in post-2.8.0 development in CVS prior to the transition to Git, so using it in releases may have caused confusion. Now that we are moving to 3.x versions, these two restrictions go away. Therefore we now change to use only two components for the feature level and use the scheme: <major>.<minor>.<patch>[-rc<n>] = Release <major>.<minor>.<date>[-<id>] = Development
* | | | CMake 3.0.0-rc1 version updateBrad King2014-02-194-8/+8
|/ / /