Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | create_test_sourcelist: Initialize variable at declaration | Sean McBride | 2014-03-31 | 1 | -2/+1 |
| | | | | Clang -Wconditional-uninitialized warns otherwise. | ||||
* | CMake 3.0.0-rc3v3.0.0-rc3 | Brad King | 2014-03-20 | 1 | -1/+1 |
| | |||||
* | Merge branch 'add_custom_command-no-INTERFACE-lib' into release | Brad King | 2014-03-19 | 6 | -1/+23 |
|\ | |||||
| * | Disallow INTERFACE libraries with add_custom_command(TARGET). | Stephen Kelly | 2014-03-19 | 6 | -1/+23 |
| | | | | | | | | Don't attempt to trace their dependencies. | ||||
* | | Merge branch 'fix-Qt5-non-Windows' into release | Brad King | 2014-03-19 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | QtDialog: Fix Qt 5 build on non-Windows. | Stephen Kelly | 2014-03-19 | 1 | -1/+1 |
|/ | | | | | The Qt5Core_QTMAIN_LIBRARIES variable is defined to the Qt5::WinMain target on Windows, and undefined elsewhere. | ||||
* | CMake 3.0.0-rc2v3.0.0-rc2 | Brad King | 2014-03-17 | 1 | -1/+1 |
| | |||||
* | Merge branch 'CONFIG-LOCATION-CMP0026' into release | Brad King | 2014-03-17 | 21 | -3/+117 |
|\ | |||||
| * | cmTarget: Restore <CONFIG>_LOCATION to CMP0026 OLD behavior (#14808) | Stephen Kelly | 2014-03-17 | 21 | -3/+117 |
| | | | | | | | | | | | | | | Restore support for the undocumented <CONFIG>_LOCATION target property removed by commit v3.0.0-rc1~175^2 (cmTarget: Remove support for <CONFIG>_LOCATION property, 2013-12-30) as part of the CMP0026 OLD behavior. | ||||
* | | Merge branch 'fix-Qt5-windows-build' into release | Brad King | 2014-03-17 | 1 | -2/+6 |
|\ \ | |||||
| * | | QtDialog: Avoid linking to Qt4 WinMain when using Qt 5. | Stephen Kelly | 2014-03-17 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | Override the QT_QTMAIN_LIBRARY cache variable with a regular variable in the Qt 5 configuration. This avoids linking with the Qt 4 version of the WinMain library. | ||||
* | | | Merge branch 'intel-14-version' into release | Brad King | 2014-03-14 | 2 | -2/+10 |
|\ \ \ | |||||
| * | | | CMake*CompilerId: Fix patch level for Intel >= 14.0 (#14806) | Brad King | 2014-03-14 | 2 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the Intel release notes: http://software.intel.com/sites/default/files/l-compiler-release-update.pdf the __INTEL_COMPILER_UPDATE predefined macro was introduced to hold the third version component. Reported-by: Dirk Ribbrock <dirk.ribbrock@mathematik.uni-dortmund.de> Co-Author: Rolf Eike Beer <kde@opensource.sf-tec.de> | ||||
* | | | | Merge branch 'fix-find_dependency-empty-version' into release | Brad King | 2014-03-14 | 1 | -2/+5 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | find_dependency: Give more helpful message if VERSION is empty | Aurélien Gâteau | 2014-03-13 | 1 | -2/+5 |
| | |/ | |/| | |||||
* | | | Merge branch 'fix-CMP0046-warning' into release | Brad King | 2014-03-12 | 6 | -4/+31 |
|\ \ \ | |/ / |/| | | |||||
| * | | cmTarget: Don't create duplicate backtraces in CMP0046 warning | Stephen Kelly | 2014-03-12 | 6 | -4/+31 |
|/ / | |||||
* | | Merge branch 'fix-find_dependency-EXACT' into release | Brad King | 2014-03-12 | 1 | -3/+3 |
|\ \ | |||||
| * | | find_dependency: Make sure invalid EXACT use can be reported. | Stephen Kelly | 2014-03-11 | 1 | -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 release | Brad King | 2014-03-11 | 5 | -92/+37 |
|\ \ \ | |/ / |/| | | |||||
| * | | Xcode: Convert forced CMAKE_<LANG>_COMPILER to full path if possible | Brad King | 2014-03-10 | 3 | -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 PATH | Brad King | 2014-03-10 | 5 | -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 release | Brad King | 2014-03-10 | 3 | -0/+13 |
|\ \ | |||||
| * | | Help: Document variables CMAKE_APPBUNDLE_PATH and CMAKE_FRAMEWORK_PATH | Brad King | 2014-03-10 | 3 | -0/+13 |
| |/ | |||||
* | | Merge branch 'fix-AUTOGEN-custom-command-depends' into release | Brad King | 2014-03-10 | 4 | -3/+36 |
|\ \ | |||||
| * | | QtAutogen: Fix AUTOGEN depends on custom command output with VS. | Stephen Kelly | 2014-03-10 | 4 | -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 release | Brad King | 2014-03-10 | 1 | -2/+11 |
|\ \ \ | |||||
| * | | | find_dependency: Don't propagate EXACT argument. | Stephen Kelly | 2014-03-06 | 1 | -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 release | Brad King | 2014-03-10 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Qt4: Use correct qdbus executable in macro. | Stephen Kelly | 2014-03-10 | 1 | -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 release | Brad King | 2014-03-10 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | FindPython{Interp,Libs}: Search for Python 3.4. | Matt McCormick | 2014-03-06 | 2 | -2/+2 |
| | |/ | |/| | | | | | | | Python 3.4.0rnc1 was released on 2014-02-20. | ||||
* | | | Merge branch 'fix-policy-scopes' into release | Brad King | 2014-03-10 | 17 | -17/+23 |
|\ \ \ | |||||
| * | | | Tests: Simplify and document policy scopes in RunCMake.CMP* tests | Brad King | 2014-03-06 | 10 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | Drop unnecessary NO_POLICY_SCOPE options. Document why the remaining options are necessary. | ||||
| * | | | Record more policies on targets when created | Brad King | 2014-03-06 | 7 | -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 release | Brad King | 2014-03-04 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | cmake: Fix --check-build-system argument count check (#14784) | Brad King | 2014-03-04 | 1 | -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 release | Brad King | 2014-03-03 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Help: Mention in find_package that cmake-gui step is Windows-only (#14781) | Brad King | 2014-03-03 | 1 | -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 release | Brad King | 2014-03-03 | 1 | -1/+7 |
|\ \ \ | |||||
| * | | | CMP0043: Document old and new interfaces for setting directory property. | Stephen Kelly | 2014-03-03 | 1 | -1/+7 |
| |/ / | |||||
* | | | Merge branch 'add_definitions-no-genex' into release | Brad King | 2014-03-03 | 1 | -4/+2 |
|\ \ \ | |||||
| * | | | add_definitions: Don't document genex support. | Stephen Kelly | 2014-03-03 | 1 | -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 release | Brad King | 2014-02-28 | 2 | -4/+22 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Help: Consolidate FindRuby-2 release notes for 3.0.0 | Brad King | 2014-02-28 | 2 | -4/+2 |
| | | | |||||
| * | | Help: Add FindRuby-2 topic release notes | Brad King | 2014-02-28 | 1 | -0/+4 |
| | | | |||||
| * | | FindRuby: Add support for Ruby 2.0 and 2.1 | Bas Couwenberg | 2014-02-28 | 1 | -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-rc1 | Brad King | 2014-02-26 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | find_dependency: unset cmake_fd_version variable at end of macro | Alex Merry | 2014-02-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | This matches the other macro variables. | ||||
| * | | | find_dependency: use correct version variable name | Alex Merry | 2014-02-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | The code set cmake_fd_version, but used ${version}. |