summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'Fortran-pgi-intel-arch' into releaseBrad King2014-04-101-0/+4
|\
| * Fortran: Detect pointer size on Intel archs with PGI (#14870)Brad King2014-04-101-0/+4
| | | | | | | | | | The PGI compiler does not define __SIZEOF_POINTER__ so use the __x86_64__ or __i386__ CPU macros to select a pointer size instead.
* | Merge branch 'CMakeDetermineVSServicePack-vs-11-update-4' into releaseBrad King2014-04-101-41/+17
|\ \
| * | CMakeDetermineVSServicePack: Add VS 11 update 4Brad King2014-04-101-1/+3
| | |
| * | CMakeDetermineVSServicePack: Match versions more robustlyBrad King2014-04-101-31/+7
| | | | | | | | | | | | | | | | | | Use the CMAKE_MATCH_* variables to simplify matching logic. Match either 3 or 4 version components. Do not fail when there are only three components available.
| * | CMakeDetermineVSServicePack: Format documentationBrad King2014-04-101-10/+8
| |/ | | | | | | Also state explicitly that the module is deprecated.
* | Merge branch 'Qt4Macros-moc-performance' into releaseBrad King2014-04-031-2/+2
|\ \
| * | Qt4Macros: Make QT4_CREATE_MOC_COMMAND a functionRobert Maynard2014-04-031-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT4_CREATE_MOC_COMMAND is given a moc_flags argument that contains the COMPILE_DEFINITIONS and a potentially large list of include directories. Since it is a macro, the ${moc_flags} reference is replaced with this content and sent through cmMakefile::ExpandVariablesInString (EVIS). Since commit v3.0.0-rc1~138^2 (Qt4: Use generator expression in COMPILE_DEFINITIONS, 2014-01-13) the COMPILE_DEFINITIONS value contains a '$' so the EVIS fast-path is no longer used. Instead the full cmCommandArgumentParserHelper is now used on the large input, which is very slow (since it was originally created for hand-written code). Change QT4_CREATE_MOC_COMMAND to a function instead of a macro to avoid passing large content through EVIS. This makes it significantly faster.
* | Merge branch 'revise-compiler-id-policies' into releaseBrad King2014-04-027-26/+82
|\ \
| * | Do not warn by default when policy CMP0025 or CMP0047 is not setBrad King2014-04-027-9/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These policies are triggered by the use of a particular compiler rather than outdated CMake code in a project. Avoid warning in every project that enables a language by not displaying the policy warning by default. Add variable CMAKE_POLICY_WARNING_CMP<NNNN> to control the warning explicitly; otherwise enable the warning with --debug-output or --trace. This breaks with strict policy convention because it does not provide developers with any warning about the behavior change by default. Existing projects will continue to build without a warning or change in behavior. When a developer changes the minimum required version of CMake in a project to a sufficiently high value (3.0), the project will suddenly get the new compiler id and may break, but at least the breakage comes with a change to the project rather than the version of CMake used to build it. Breaking strict policy convention is worthwhile in this case because very few projects will be affected by the behavior change but every project would have to see the warning if it were enabled by default.
| * | Help: Revise and format policy CMP0025 and CMP0047 docsBrad King2014-04-022-20/+31
| |/ | | | | | | | | | | Add inline reST markup as appropriate. Word CMP0047 docs more like those of CMP0025. State explicitly that the policies must be set before the project or enable_language command calls.
* | Merge branch 'fix_policy_diagnostics' into releaseBrad King2014-04-0220-112/+34
|\ \
| * | Policies: omit warnings about unset policies when they are actually set to NEWNils Gladitz2014-03-3120-112/+34
| |/
* | Merge branch 'clang-warnings' into releaseBrad King2014-04-021-2/+1
|\ \
| * | create_test_sourcelist: Initialize variable at declarationSean McBride2014-03-311-2/+1
| |/ | | | | | | Clang -Wconditional-uninitialized warns otherwise.
* | Merge branch 'fix-Qt-manual-typo' into releaseBrad King2014-03-261-1/+1
|\ \ | |/ |/|
| * Help: Fix typo in cmake-qt manual.Stephen Kelly2014-03-261-1/+1
| | | | | | | | Do -> To.
* | CMake 3.0.0-rc3v3.0.0-rc3Brad King2014-03-201-1/+1
|/
* Merge branch 'add_custom_command-no-INTERFACE-lib' into releaseBrad King2014-03-196-1/+23
|\
| * Disallow INTERFACE libraries with add_custom_command(TARGET).Stephen Kelly2014-03-196-1/+23
| | | | | | | | Don't attempt to trace their dependencies.
* | Merge branch 'fix-Qt5-non-Windows' into releaseBrad King2014-03-191-1/+1
|\ \ | |/ |/|
| * QtDialog: Fix Qt 5 build on non-Windows.Stephen Kelly2014-03-191-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-rc2Brad King2014-03-171-1/+1
|
* Merge branch 'CONFIG-LOCATION-CMP0026' into releaseBrad King2014-03-1721-3/+117
|\
| * cmTarget: Restore <CONFIG>_LOCATION to CMP0026 OLD behavior (#14808)Stephen Kelly2014-03-1721-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 releaseBrad King2014-03-171-2/+6
|\ \
| * | QtDialog: Avoid linking to Qt4 WinMain when using Qt 5.Stephen Kelly2014-03-171-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 releaseBrad King2014-03-142-2/+10
|\ \ \
| * | | CMake*CompilerId: Fix patch level for Intel >= 14.0 (#14806)Brad King2014-03-142-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 releaseBrad King2014-03-141-2/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | find_dependency: Give more helpful message if VERSION is emptyAurélien Gâteau2014-03-131-2/+5
| | |/ | |/|
* | | Merge branch 'fix-CMP0046-warning' into releaseBrad King2014-03-126-4/+31
|\ \ \ | |/ / |/| |
| * | 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.
generated by cgit v0.12 at 2025-01-10 15:44:21 (GMT)