summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Consolidate list() argument count testingPetr Kmoch2012-11-021-26/+10
| | | | Move test for list() argument count >= 2 to InitialPass().
* CMake Nightly Date StampKitware Robot2012-09-291-1/+1
|
* Merge topic 'generator-expression-target-properties'Brad King2012-09-2818-121/+490
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 083de7e Process generator expressions in the COMPILE_DEFINITIONS target property. 08cb4fa Process generator expressions in the INCLUDE_DIRECTORIES property. 0ef091d Early return if there is no target. eb250cd Add a self-reference check for target properties. 7e80747 Add API to check that dependent target properties form a DAG. 239ac84 Add a generator expression for target properties. e028381 Extend the generator expression language with more logic. b8e61d6 Refactor GetCompileDefinitions a bit. 2c2b25b Return a std::string from GetCompileDefinitions. b7e48e0 Add an AppendDefines std::string overload. 9a16087 Convert paths in INCLUDE_DIRECTORIES property to Unix slashes. 4557c8d Don't prepend a path before generator expressions in include_directories. c6abc41 Add include guard for cmGeneratorExpression. 0ff4e3f Port remaining code to GetCompileDefinitions(). f178d53 Fix indentation in the code blocks generator.
| * Process generator expressions in the COMPILE_DEFINITIONS target property.Stephen Kelly2012-09-281-1/+16
| |
| * Process generator expressions in the INCLUDE_DIRECTORIES property.Stephen Kelly2012-09-282-3/+26
| | | | | | | | | | This use of generator expressions, like all others to come which operate on target properties, must initalize the dag checker.
| * Early return if there is no target.Stephen Kelly2012-09-281-4/+7
| | | | | | | | | | | | The remainder of this method depends on the target existing (otherwise the includes container would be empty), so make the code a little more readable.
| * Add a self-reference check for target properties.Stephen Kelly2012-09-281-1/+16
| | | | | | | | | | | | | | | | | | | | Prevent constructs like: ... INCLUDE_DIRECTORIES "$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>" Indirect self-references (cycles) are also prevented here, but indirect generator expression references of any kind are not possible yet anyway.
| * Add API to check that dependent target properties form a DAG.Stephen Kelly2012-09-287-26/+203
| | | | | | | | | | | | Initially this will only be used to check for self-references, but can be extended to check for cycles when chaining properties of other targets.
| * Add a generator expression for target properties.Stephen Kelly2012-09-286-5/+66
| | | | | | | | | | | | | | | | There are two overloads, so that it can use the operational target when a target property is being evaluated, and a target can alternatively be specified by name. At this point, the generators don't chain. That comes later.
| * Extend the generator expression language with more logic.Stephen Kelly2012-09-282-0/+74
| | | | | | | | | | | | | | Generator expressions for comparing strings, evaluating strings as booleans, and for creating literal right-angle-brackets and commas are added. Those may be needed in some cases where they appear in literals.
| * Refactor GetCompileDefinitions a bit.Stephen Kelly2012-09-211-6/+6
| | | | | | | | It is now easier to add generator expressions.
| * Return a std::string from GetCompileDefinitions.Stephen Kelly2012-09-215-8/+10
| |
| * Add an AppendDefines std::string overload.Stephen Kelly2012-09-211-0/+5
| | | | | | | | This makes it easier to use with cmGeneratorTarget::GetCompileDefinitions.
| * Convert paths in INCLUDE_DIRECTORIES property to Unix slashes.Stephen Kelly2012-09-211-2/+7
| | | | | | | | Duplicate some of the logic from the include_directories command.
| * Don't prepend a path before generator expressions in include_directories.Stephen Kelly2012-09-211-4/+7
| |
| * Add include guard for cmGeneratorExpression.Stephen Kelly2012-09-211-0/+6
| |
| * Port remaining code to GetCompileDefinitions().Stephen Kelly2012-09-214-36/+18
| |
| * Fix indentation in the code blocks generator.Stephen Kelly2012-09-211-43/+41
| |
* | Merge topic 'ninja-OBJECT_DEPENDS'David Cole2012-09-281-4/+3
|\ \ | | | | | | | | | | | | 8f0e08d Ninja: OBJECT_DEPENDS should set an implicit dependency
| * | Ninja: OBJECT_DEPENDS should set an implicit dependencyPeter Kümmel2012-09-251-4/+3
| | | | | | | | | | | | BUG 13559
* | | Merge topic 'ctest-svn-non-interactive'David Cole2012-09-283-22/+62
|\ \ \ | | | | | | | | | | | | | | | | 9ace801 ctest_update: Tell svn not to prompt interactively (#13024)
| * | | ctest_update: Tell svn not to prompt interactively (#13024)Nils Gladitz2012-09-253-22/+62
| | | | | | | | | | | | | | | | | | | | While at it, add SVNOptions/CTEST_SVN_OPTIONS configuration settings to add options to all svn invocations instead of just "svn update".
* | | | CMake Nightly Date StampKitware Robot2012-09-281-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2012-09-271-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2012-09-261-1/+1
| | | |
* | | | Merge topic 'AutomocUseTargetProperties'David Cole2012-09-252-35/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e83cc94 Use the cmGeneratorTarget for the include directories API. 9d8e59d Merge branch 'use-generator-target' into AutomocUseTargetProperties ea12871 Automoc: also the makefile-COMPILE_DEFINITIONS 894e91a Automoc: do not use DEFINITIONS, but only COMPILE_DEFINITIONS 825d1ab Automoc: fix #13493, use target properties for include dirs
| * | | | Use the cmGeneratorTarget for the include directories API.Stephen Kelly2012-09-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Also, no need to get the include directories from the target beforehand. The local generator does that for us anyway.
| * | | | Merge branch 'use-generator-target' into AutomocUseTargetPropertiesStephen Kelly2012-09-1989-1192/+3399
| |\ \ \ \
| * | | | | Automoc: also the makefile-COMPILE_DEFINITIONSAlex Neundorf2012-09-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | Automoc: do not use DEFINITIONS, but only COMPILE_DEFINITIONSAlex Neundorf2012-09-052-33/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs say that this is for cmake 2.4 backwards compatibility only, so we probably don't need to support it. Alex
| * | | | | Automoc: fix #13493, use target properties for include dirsAlex Neundorf2012-09-051-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | Merge topic 'use-generator-target'David Cole2012-09-2526-262/+378
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 879fd35 Revert "Move GenerateTargetManifest to cmGeneratorTarget." 6674583 Fix compiler warning with initialization order. 5285458 Add convenience for getting a cmGeneratorTarget to use. c31f3d9 Add a wrapper for accessing config-specific compile-definitions. d1446ca Append the COMPILE_DEFINITIONS from the Makefile to all targets. 290e92a Move GetIncludeDirectories to cmGeneratorTarget. f9146f6 Port cmLocalGenerator::GetTargetFlags to cmGeneratorTarget. 9facfd1 Move GetCreateRuleVariable to cmGeneratorTarget. 78bfee3 Make cmLocalGenerator::AddArchitectureFlags take a cmGeneratorTarget. 4f5384e Move GetLinkInformation to cmGeneratorTarget 987e12e Move GenerateTargetManifest to cmGeneratorTarget. 14bf778 Store cmGeneratorTargets with the makefile. f428ca2 Add more forwarding API to cmGeneratorTarget.
| * | | | | Revert "Move GenerateTargetManifest to cmGeneratorTarget."Stephen Kelly2012-09-205-79/+76
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 987e12e2f962b6e9ed9f15f8ff486512911b744e. GenerateTargetManifest is called by the global generator before it creates the generator targets, so we can't move it to cmGeneratorTarget yet.
| * | | | Fix compiler warning with initialization order.Stephen Kelly2012-09-191-1/+1
| | | | |
| * | | | Add convenience for getting a cmGeneratorTarget to use.Stephen Kelly2012-09-192-0/+7
| | | | |
| * | | | Add a wrapper for accessing config-specific compile-definitions.Stephen Kelly2012-09-195-12/+31
| | | | |
| * | | | Append the COMPILE_DEFINITIONS from the Makefile to all targets.Stephen Kelly2012-09-194-26/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way we don't need to check the definitions from the Makefile when generating later, and can more easily add generator expressions. Duplication is not a problem as the definitions are de-duplicated before generating.
| * | | | Move GetIncludeDirectories to cmGeneratorTarget.Stephen Kelly2012-09-1916-52/+68
| | | | |
| * | | | Port cmLocalGenerator::GetTargetFlags to cmGeneratorTarget.Stephen Kelly2012-09-196-26/+28
| | | | |
| * | | | Move GetCreateRuleVariable to cmGeneratorTarget.Stephen Kelly2012-09-195-24/+25
| | | | |
| * | | | Make cmLocalGenerator::AddArchitectureFlags take a cmGeneratorTarget.Stephen Kelly2012-09-1913-49/+56
| | | | |
| * | | | Move GetLinkInformation to cmGeneratorTargetStephen Kelly2012-09-1913-78/+95
| | | | |
| * | | | Move GenerateTargetManifest to cmGeneratorTarget.Stephen Kelly2012-09-195-76/+79
| | | | |
| * | | | Store cmGeneratorTargets with the makefile.Stephen Kelly2012-09-194-6/+24
| | | | |
| * | | | Add more forwarding API to cmGeneratorTarget.Stephen Kelly2012-09-192-0/+36
| | | | | | | | | | | | | | | | | | | | This API is the most commonly required in the following patches.
* | | | | Merge topic 'osx-sysroot-cleanup'David Cole2012-09-252-39/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df92864 OS X: Ignore MACOSX_DEPLOYMENT_TARGET during Xcode compiler id e7e613e OS X: Teach deployment target sanity check about SDK names 43b7479 OS X: Further improve default CMAKE_OSX_SYSROOT selection 2690738 OS X: If CMAKE_OSX_SYSROOT is already set do not compute default 7995722 OS X: Simplify selection of CMAKE_OSX_ARCHITECTURES 1786b12 OS X: Allow CMAKE_OSX_SYSROOT to be a logical SDK name 242f673 Tests/Assembler: Use CMAKE_OSX_SYSROOT to generate .s file a1c032b bootstrap: Suppress CMAKE_OSX_SYSROOT if CFLAGS have -isysroot 230ea21 OS X: Improve default CMAKE_OSX_SYSROOT selection a0a0877 OS X: Always generate -isysroot if any SDK is in use 33a60e6 Xcode: Remove unused code reading CMAKE_OSX_SYSROOT_DEFAULT
| * | | | | OS X: Always generate -isysroot if any SDK is in useBrad King2012-09-211-29/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the last use of CMAKE_OSX_SYSROOT_DEFAULT. Replace internal platform variable CMAKE_${lang}_HAS_ISYSROOT with a more general CMAKE_${lang}_SYSROOT_FLAG variable. If the -isysroot flag exists and CMAKE_OSX_SYSROOT points to an SDK (not "/") then always add it to compiler command lines. This is already done in the Xcode IDE.
| * | | | | Xcode: Remove unused code reading CMAKE_OSX_SYSROOT_DEFAULTBrad King2012-09-211-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The condition for entering the block where the value is used can never be true anymore.
* | | | | | Merge topic 'qt5-qtdialog-port'David Cole2012-09-251-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92b6d85 Enable deprecated API when using Qt 5.
| * | | | | | Enable deprecated API when using Qt 5.Stephen Kelly2012-09-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QAbstractItemModel::reset() method is deprecated in Qt 5, and therefore not part of the API by default (on non-Windows). The replacement for it is beginResetModel/endResetModel which are available from Qt 4.6 onwards. The minimum version of Qt required is currently 4.4, so enable the deprecated API instead of changing that.