summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* CMake 3.1.1v3.1.1Brad King2015-01-201-1/+1
* Merge branch 'doc-virtual-override-specifiers-links' into releaseBrad King2015-01-191-2/+7
|\
| * Help: Link relevant documents for virtual override features (#15311)Stephen Kelly2015-01-191-2/+7
* | Merge branch 'xcode-target-sort' into releaseBrad King2015-01-192-14/+54
|\ \
| * | Xcode: Sort targets deterministically and with ALL_BUILD first (#15346)Ben Boeckel2015-01-191-1/+25
| * | Xcode: Fix early termination on per-config source file errorBrad King2015-01-192-13/+29
| |/
* | Merge branch 'emacs-mode-fix-word-at-point' into releaseBrad King2015-01-191-0/+1
|\ \
| * | cmake-mode.el: Re-add explicit call to require thingatptPeter Vasil2015-01-191-0/+1
* | | Merge branch 'emacs-mode-fix-word-at-point' into releaseBrad King2015-01-191-3/+7
|\ \ \ | |/ /
| * | cmake-mode.el: Fix extracting keyword at point in cmake-helpPeter Vasil2015-01-191-3/+7
* | | Merge branch 'FindQt-fixes' into releaseBrad King2015-01-161-3/+10
|\ \ \
| * | | FindQt: explicitely mention that it cannot Qt5 or laterRolf Eike Beer2015-01-161-0/+3
| * | | FindQt: fix variable name in error messageRolf Eike Beer2015-01-161-2/+2
| * | | FindQt: fix setting DESIRED_QT_VERSION if "find_package(Qt VVV)" was calledRolf Eike Beer2015-01-161-1/+5
* | | | Merge branch 'fix-cmake-org-links' into releaseBrad King2015-01-163-4/+4
|\ \ \ \
| * | | | Help: Update cmake.org links to avoid redirectsWilliam Lynch2015-01-163-4/+4
| | |_|/ | |/| |
* | | | Merge branch 'release-3.0' into releaseBrad King2015-01-161-0/+1
|\ \ \ \
| * \ \ \ Merge branch 'eclipse-fix-cxx-natures' into release-3.0Brad King2015-01-161-0/+1
| |\ \ \ \
| | * | | | Eclipse: Add org.eclipse.cdt.core.cnature to CXX projects (#15068)André Klitzing2015-01-161-0/+1
* | | | | | Merge branch 'fix-qcc-compiler-id' into releaseBrad King2015-01-153-3/+3
|\ \ \ \ \ \
| * | | | | | QNX: Fix detection of QCC compiler id (#15349)Brad King2015-01-143-3/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix-COMPILE_FEATURES-genex' into releaseBrad King2015-01-153-9/+17
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Features: Fix the COMPILE_FEATURES genex for unavailable features.Stephen Kelly2015-01-121-0/+7
| * | | | | cmMakefile: Rename a method to what it really does.Stephen Kelly2015-01-123-9/+10
* | | | | | Merge branch 'cpack-PackageMaker-OSX-10.10' into releaseBrad King2015-01-152-10/+26
|\ \ \ \ \ \
| * | | | | | CPack: Fix PackageMaker internal versioning for OS X 10.10Calin Cascaval2015-01-122-10/+26
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fix-LOCATION-with-TARGET_OBJECTS' into releaseBrad King2015-01-145-0/+21
|\ \ \ \ \ \
| * | | | | | cmTarget: Compute link language of TARGET_OBJECTS with CMP0026 OLD (#15338)Stephen Kelly2015-01-135-0/+21
* | | | | | | Merge branch 'FindRuby-zero-version' into releaseBrad King2015-01-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | FindRuby: fix selection of version x.0 (#15345)David Coppa2015-01-121-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'FindRuby-fix-version' into releaseBrad King2015-01-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | FindRuby: Fix output check in _RUBY_CONFIG_VAREvangelos Foutras2015-01-111-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'FindBoost-update-versions' into releaseBrad King2015-01-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | FindBoost: Add latest Boost version 1.57.0 and next milestone 1.58.0Sergey Nikulov2015-01-131-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'backport-cpack_invalid_cmake_generator' into releaseBrad King2015-01-141-0/+8
|\ \ \ \ \ \ \
| * | | | | | | CPack: Avoid crash on invalid CMake generator name (#15308)Domen Vrankar2015-01-141-0/+8
| |/ / / / / /
* | | | | | | Merge branch 'linux-XL-fortran' into releaseBrad King2015-01-143-0/+3
|\ \ \ \ \ \ \
| * | | | | | | XL: Fix link flags for executables on Linux with XL compilersBrad King2015-01-123-0/+3
| |/ / / / / /
* | | | | | | Merge branch 'backport-copyright-year' into releaseBrad King2015-01-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Copyright.txt: Update year range to end in 2015Brad King2015-01-121-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'xcode-ios-compiler-id' into releaseBrad King2015-01-122-6/+1
|\ \ \ \ \ \ \
| * | | | | | | Xcode: Do not require code signing for compiler id (#15214)Brad King2015-01-112-6/+1
| |/ / / / / /
* | | | | | | Merge branch 'doc-CMAKE_FIND_PACKAGE_NAME' into releaseBrad King2015-01-123-0/+9
|\ \ \ \ \ \ \
| * | | | | | | Help: Document CMAKE_FIND_PACKAGE_NAME variableBrad King2015-01-112-0/+7
| * | | | | | | find_package: Document CMAKE_FIND_PACKAGE_NAME variableGregor Jasny2015-01-111-0/+2
| |/ / / / / /
* | | | | | | Merge branch 'fix-autouic-regression' into releaseBrad King2015-01-123-1/+10
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | QtAutoUic: Add a test for the regression in the parent commit.Stephen Kelly2015-01-122-0/+9
| * | | | | | QtAutoUic: Restore source file AUTOUIC_OPTIONS settingsJustin Borodinsky2015-01-111-1/+1
| |/ / / / /
* | | | | | Merge branch 'fix-empty-target-property-queries' into releaseBrad King2015-01-1120-6/+170
|\ \ \ \ \ \
| * | | | | | tests: add tests for querying propertiesBen Boeckel2015-01-1117-0/+161