summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix spelling typos in comments and documentation (#16037)Felix Geyer2016-03-2951-67/+67
| | | | | The Debian package checker tool (lintian) detected several typos in CMake.
* Merge topic 'asm-includes'Brad King2016-03-295-5/+5
|\ | | | | | | | | 9408a7a8 ASM: Add missing <INCLUDES> placeholder for "compile" rules
| * ASM: Add missing <INCLUDES> placeholder for "compile" rulesGregor Jasny2016-03-295-5/+5
| | | | | | | | | | | | | | | | This placeholder was added to the compilation rules for other languages by commit v3.4.0-rc1~342^2 (Factor an <INCLUDES> placeholder out of <FLAGS> in rule variables, 2015-07-13) but ASM was incorrectly left out. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | Merge topic 'ghs-link-flags'Brad King2016-03-295-7/+46
|\ \ | | | | | | | | | | | | | | | 36ad8dd4 GHS: Implement link flags and dirs for non-target groups (#16029) 230d50ed GHS: Factor out compiler information shared among languages
| * | GHS: Implement link flags and dirs for non-target groups (#16029)Geoff Viola2016-03-283-3/+36
| | |
| * | GHS: Factor out compiler information shared among languagesGeoff Viola2016-03-283-4/+10
| | | | | | | | | | | | | | | Move common information in `Modules/Compiler/GHS-*.cmake` over to a common `Modules/Compiler/GHS.cmake` and include it.
* | | Merge topic 'cpack-rpm-default-user-and-group'Brad King2016-03-294-1/+149
|\ \ \ | | | | | | | | | | | | | | | | 1fe004ea cpack rpm setting of defattr
| * | | cpack rpm setting of defattrDomen Vrankar2016-03-284-1/+149
| |/ / | | | | | | | | | | | | | | | | | | | | | RPM supports setting of default user, group, file and directory permissions that will be applied for files in package unless specified per file/dir with attr setting This is related to bug report 14714
* | | CMake Nightly Date StampKitware Robot2016-03-291-1/+1
|/ /
* | Merge topic 'test-fix-FindGTK2-cxx11'Brad King2016-03-281-0/+5
|\ \ | | | | | | | | | | | | c41b9dc7 Tests: Fix GTK2Components.gtkmm test with sigc++ >= 2.5.1
| * | Tests: Fix GTK2Components.gtkmm test with sigc++ >= 2.5.1Brad King2016-03-251-0/+5
| | | | | | | | | | | | | | | | | | | | | FindGTK2 adds compile features to GTK2::sigc++ so that clients will compile as C++11 or above. However, our test case covers using just the library list variables instead of the imported targets. Fix this case by propagating the compile features manually.
* | | Merge topic 'xcode73-xctest-location'Brad King2016-03-281-0/+4
|\ \ \ | | | | | | | | | | | | | | | | a364d251 Xcode: Fixup XCTest bundle location for Xcode 7.3
| * | | Xcode: Fixup XCTest bundle location for Xcode 7.3Gregor Jasny2016-03-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to Xcode 7.3 a XCTest bundle was built like an ordinary bundle. But starting with Xcode 7.3 it is implicitely built as a plugin for the test host. It looks like in that case the 'Build Products Path' is ignored. This patch simply sets the CMake target output path to the value Xcode expects internally to get a matching view of both. The command: xcodebuild -showBuildSettings -target CocoaExampleTests -configuration Debug Output with Xcode 7.2: TARGET_BUILD_DIR = .../Tests/XCTest/Debug Output with Xcode 7.3 TARGET_BUILD_DIR = .../Tests/XCTest/Debug/CocoaExample.app/Contents/PlugIns Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | Merge topic 'only_change_timeout_once'Brad King2016-03-281-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 06b7f5d2 CTest: Only apply the secondary test timeout once
| * | | | CTest: Only apply the secondary test timeout onceZack Galbreath2016-03-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes a bug in the implementation of the test property TIMEOUT_AFTER_MATCH. The new timeout value was being applied every time a line was output by the test after the match had been encountered. Now the new timeout value is only set once. This commit also improves some output formatting related to this property.
* | | | | CMake Nightly Date StampKitware Robot2016-03-281-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-03-271-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-03-261-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'cpackcomponents-priv-var'Brad King2016-03-251-22/+22
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | c70ac097 CPack: Exclude additional internal variables from CPackConfig.cmake
| * | | CPack: Exclude additional internal variables from CPackConfig.cmakeNils Gladitz2016-03-241-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In v2.8.12.1-654-g7621ad6 I added underscore prefixes to CPACK_ADDCOMP_(STR|UNAME) to prevent them from being automatically written to CPackConfig.cmake. Do the same for CPACK_ADDGRP_(STR|UNAME) and CPACK_INSTTYPE_(STR|UNAME).
* | | | CMake Nightly Date StampKitware Robot2016-03-251-1/+1
| | | |
* | | | Merge branch 'release'Brad King2016-03-240-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | CMake 3.5.1v3.5.1Brad King2016-03-241-1/+1
| | | |
* | | | Merge branch 'release'Brad King2016-03-240-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'fix-variable_watch-reallocation' into releaseBrad King2016-03-233-10/+19
| |\ \ \
| * \ \ \ Merge branch 'FindCUDA-verbatim' into releaseBrad King2016-03-221-1/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'fix-repeat-pkg-config' into releaseBrad King2016-03-212-6/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cpack-osx-optional-CoreServices' into releaseBrad King2016-03-182-1/+20
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'cmake-gui-osx-identifier' into releaseBrad King2016-03-171-0/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'cpack-osx-no-carbon' into releaseBrad King2016-03-172-16/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ios-install-combined-one-arch' into releaseBrad King2016-03-154-1/+75
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge topic 'fix-variable_watch-reallocation'Brad King2016-03-243-10/+19
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c6104028 Avoid occasional use-after-free when a variable watch is executed
| * | | | | | | | | | Avoid occasional use-after-free when a variable watch is executedYves Frederix2016-03-233-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-lookup a variable value when an associated VariableWatch is executed in cmMakefile::GetDefinition. This fixes a problem with 'def' sometimes becoming invalid due to memory reallocation inside an std::vector. In this case, the problem was that if the call to VariableAccessed actually executed a callback function, the internal state of the makefile has changed due to the associated function scope being pushed. This in turn implies that a new cmDefinitions instance was pushed in cmMakefile::VarTree. As cmLinkedTree is based on an std::vector, this push can have triggered reallocation of its internal memory buffer. However, as the value of 'def', which was computed on method entry, actually points to a property of one of the cmDefinitions instances in cmMakefile::VarTree, reallocation can invalidate the value of 'def' so that it cannot simply be returned at the end of the function. The solution implemented here is to simply lookup the value of 'def' again.
* | | | | | | | | | | Merge topic 'cmake-depend-in-project-only'Brad King2016-03-249-0/+107
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b06e17da Help: Add notes for topic 'cmake-depend-in-project-only' 52540245 Tests: Add test for CMAKE_DEPENDS_IN_PROJECT_ONLY variable b1e1aa1e Makefile: Optionally scan only source and build trees for dependencies
| * | | | | | | | | | | Help: Add notes for topic 'cmake-depend-in-project-only'Brad King2016-03-231-0/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Tests: Add test for CMAKE_DEPENDS_IN_PROJECT_ONLY variableBrad King2016-03-235-0/+29
| | | | | | | | | | | |
| * | | | | | | | | | | Makefile: Optionally scan only source and build trees for dependenciesAttila Krasznahorkay2016-03-223-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `CMAKE_DEPENDS_IN_PROJECT_ONLY` variable to activate the behavior.
* | | | | | | | | | | | Merge topic 'vs-startup-project'Brad King2016-03-2416-10/+122
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad140c6e VS: Put ALL_BUILD in the PREDEFINED_TARGETS_FOLDER f069be05 VS: Fix default target support for targets nested inside a folder c05ea485 VS: Improve unit test macros 78ec0461 VS: Add option to choose the `.sln` startup project (#15578)
| * | | | | | | | | | | | VS: Put ALL_BUILD in the PREDEFINED_TARGETS_FOLDERTaylor Braun-Jones2016-03-231-7/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | VS: Fix default target support for targets nested inside a folderTaylor Braun-Jones2016-03-235-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not actually the first target in a `.sln` file that is treated as the default startup project, but rather the first fully defined target.
| * | | | | | | | | | | | VS: Improve unit test macrosTaylor Braun-Jones2016-03-223-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change `getFirstProject` macro to more flexible version `getProjectNames`
| * | | | | | | | | | | | VS: Add option to choose the `.sln` startup project (#15578)Davy Durham2016-03-2213-1/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `VS_STARTUP_PROJECT` directory property to specify the project that should be placed first in the `.sln` file so that it will be selected as the default startup project. Co-Author: Taylor Braun-Jones <taylor.braunjones@avigilon.com>
* | | | | | | | | | | | | Merge topic 'FindBoost-xl-compiler'Brad King2016-03-241-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4527b9c4 FindBoost: Add support for IBM XL compiler
| * | | | | | | | | | | | | FindBoost: Add support for IBM XL compilerErik Zenker2016-03-231-0/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge topic 'doc-cmake_minimum_required-policy-reset'Brad King2016-03-241-18/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1dc8486b Help: Organize and clarify `cmake_minimum_required` documentation
| * | | | | | | | | | | | | Help: Organize and clarify `cmake_minimum_required` documentationBrad King2016-03-231-18/+27
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | State more explicitly that `cmake_policy(VERSION)` is implied and explain the effects it has.
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-241-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge topic 'CMakePackageConfigHelpers-relative-prefix'Brad King2016-03-231-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd31feb0 CMakePackageConfigHelpers: allow to specify a relative CMAKE_INSTALL_PREFIX
| * | | | | | | | | | | | CMakePackageConfigHelpers: allow to specify a relative CMAKE_INSTALL_PREFIXSergiu Deitsch2016-03-221-1/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'FindCUDA-verbatim'Brad King2016-03-231-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72a97b7a FindCUDA: Fix regression in separate compilation (#16027)
generated by cgit v0.12 at 2024-11-09 12:13:46 (GMT)