summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | 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
| * | | | | | set_tests_properties: fix documentationBen Boeckel2015-01-111-1/+1
| * | | | | | get_test_property: clarify the documentationBen Boeckel2015-01-111-4/+4
| * | | | | | get_target_property: discern empty from undefined properties (#15333)Stephen Kelly2015-01-111-1/+4
| |/ / / / /
* | | | | | Merge branch 'FindSDL-quoting' into releaseBrad King2015-01-081-1/+1
|\ \ \ \ \ \
| * | | | | | FindSDL: Allow if() to dereference SDL_INCLUDE_DIR for matchingRolf Eike Beer2015-01-081-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'FindCUDA-cross' into releaseBrad King2015-01-081-2/+2
|\ \ \ \ \ \
| * | | | | | FindCUDA: Do not assume CMAKE_SYSTEM_PROCESSOR is setMark Abraham2015-01-081-2/+2
| |/ / / / /
* | | | | | Merge branch 'FindIce-CMP0054' into releaseBrad King2015-01-081-5/+5
|\ \ \ \ \ \
| * | | | | | FindIce: Port to work with CMP0054 NEW behaviorRolf Eike Beer2015-01-081-5/+5
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'doc-CXX_STANDARD-14' into releaseBrad King2015-01-081-1/+1
|\ \ \ \ \ \
| * | | | | | Help: Document valid 14 value for CXX_STANDARD. (#15339)Stephen Kelly2015-01-081-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'doc-if-variable-not-defined' into releaseBrad King2015-01-081-4/+5
|\ \ \ \ \ \
| * | | | | | Help: Clarify if(<variable>) documentation (#15335)Brad King2015-01-081-4/+5
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'kwsys-Terminal-xterm-termite' into releaseBrad King2015-01-081-0/+1
|\ \ \ \ \ \
| * | | | | | KWSys Terminal: Add xterm-termite to VT100 color support whitelistSimon Gomizelj2015-01-081-0/+1
| |/ / / / /
* | | | | | Merge branch 'doc-octothorpe-escaping' into releaseBrad King2014-12-241-0/+22
|\ \ \ \ \ \
| * | | | | | Help: Add 3.1 release note about '#' escaping in Makefiles (#15322)Brad King2014-12-231-0/+22
| |/ / / / /
* | | | | | Merge branch 'ninja-fix-subdir-objlib-languages' into releaseBrad King2014-12-246-2/+25
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Tests: Test using objects from a language enabled in a subdirectory (#15325)Brad King2014-12-235-0/+10
| * | | | | Ninja: Generate rules only for languages compiled in a target (#15325)Brad King2014-12-231-2/+15
* | | | | | Merge branch 'ninja-fix-crash-on-error' into releaseBrad King2014-12-231-1/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Ninja: Do not crash when CMAKE_<LANG>_COMPILE_OBJECT is empty (#15325)Brad King2014-12-221-1/+4
| |/ / / /
* | | | | Merge branch 'CPackComponent-docs-fix' into releaseBrad King2014-12-221-2/+2
|\ \ \ \ \
| * | | | | Help: Small fixes in CPackComponent documentationDaniele E. Domenichelli2014-12-221-2/+2
| |/ / / /
* | | | | Merge branch 'backport-suncc-fixes' into releaseBrad King2014-12-221-2/+3
|\ \ \ \ \