summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Find targets in INTERFACE_COMPILE_OPTIONS when exporting for try_compile.Stephen Kelly2013-06-101-0/+1
| | | | | This was missing from commit 80ca9c4b (Add COMPILE_OPTIONS target property., 2013-05-16).
* Add missing 'seen' check for evaluating COMPILE_OPTIONS.Stephen Kelly2013-06-101-1/+2
| | | | | | | | | | | | | | | Commit 089fe1c1 (Optimize genex evaluation for includes and defines., 2013-02-01) introduced an optimization on DAG processing to not reprocess properties on targets which have already been seen. This was refactored slightly in commit 8dfdf1c7 (Fix the tests for evaluating includes and defines., 2013-02-18), but was not extended to cover COMPILE_OPTIONS in commit 80ca9c4b (Add COMPILE_OPTIONS target property., 2013-05-16). This omission causes the same performance regression in running cmake on LLVM which 089fe1c1 fixed before, but this time for the transitive evaluation of the COMPILE_OPTIONS property.
* CMake Nightly Date StampKitware Robot2013-06-101-1/+1
|
* CMake Nightly Date StampKitware Robot2013-06-091-1/+1
|
* CMake Nightly Date StampKitware Robot2013-06-081-1/+1
|
* CMake Nightly Date StampKitware Robot2013-06-071-1/+1
|
* CMake Nightly Date StampKitware Robot2013-06-061-1/+1
|
* Merge topic 'fix-genex-HEAD-target'Brad King2013-06-051-4/+9
|\ | | | | | | | | 5b22235 Genex: Fix the HEAD target used for evaluated expressions
| * Genex: Fix the HEAD target used for evaluated expressionsStephen Kelly2013-06-051-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the expression $<TARGET_PROPERTY:prop> appears in the content of a target property, the target that prop is read from is the 'head target' of the expression. In contexts such as evaluating the content of a target property during generation, such as INCLUDE_DIRECTORIES, the 'head target' is the one on which the initial request was made. If evaluating a generator expression which is not a target property content, the target must be explicitly specified. Such contexts include add_custom_command and file(GENERATE). The content might then look like $<TARGET_PROPERTY:tgt,prop> However, as there is no HeadTarget set, any generator expressions evaluated as part of reading prop from tgt which do not specify the tgt directly report an error. Modify the logic of the TARGET_PROPERTY generator expression so that in such contexts, the 'head target' is set to the appropriate target which was first encountered.
* | Merge topic 'xcode-framework-paths'Brad King2013-06-051-11/+7
|\ \ | | | | | | | | | | | | 21a0bea Xcode: Fix framework search paths in STATIC library targets (#14191)
| * | Xcode: Fix framework search paths in STATIC library targets (#14191)Brad King2013-06-041-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 2bc22bda (Xcode: Add frameworks search paths from link dependeny closure, 2012-12-07) we made framework search paths from the link closure conditional on target type, skipping it on STATIC and OBJECT library targets that do not actually link. However, the framework search paths also influence the compile lines (-F options) so we need them for all target types. The Makefile generator already does this, as did the Xcode generator prior to the above-mentioned commit.
* | | Merge topic 'update-kwsys'Brad King2013-06-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | c91e88d Merge branch 'upstream-kwsys' into update-kwsys 6dc3dd9 KWSys 2013-06-03 (d79a792e)
| * | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-06-041-1/+1
| | | |
* | | | Merge topic 'doc-CMAKE_PARENT_LIST_FILE'Brad King2013-06-051-5/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | b62d440 Docs: Clarify CMAKE_PARENT_LIST_FILE (#14194)
| * | | | Docs: Clarify CMAKE_PARENT_LIST_FILE (#14194)Brad King2013-06-041-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the wording of the documentation for CMAKE_PARENT_LIST_FILE to clarify that it only applies to the include stack in the current directory. Specify exactly what commands can include files instead of saying "somehow invoke".
* | | | | Merge topic 'suppress-unused-cli-with-value-in-cache'Brad King2013-06-052-1/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 273ecab CLI: Suppress the unused warning if the key value pair is cached.
| * | | | | CLI: Suppress the unused warning if the key value pair is cached.Stephen Kelly2013-06-042-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is common to specify a CMAKE_TOOLCHAIN_FILE and get a warning for using it despite it not being used. The WarnUnusedCliUnused test relies on the warning being emitted each time cmake is run on an existing build. That behavior is changed by this patch to warn only on the first invokation of CMake, and not on subsequent invokations (because the variable is in the cache with the same value). For that test, a clean target is added which clears the cache and cause the warning to be emitted each time. As the Ninja generator does not support the feature needed to test this, it is not tested with that generator.
* | | | | | Merge topic 'cleanups'Brad King2013-06-052-8/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9efe359 Add some spaces to the INCLUDE_DIRECTORIES documentation. db15713 Remove unused cmAddDefinitionsCommand::ParseDefinition method.
| * | | | | | Add some spaces to the INCLUDE_DIRECTORIES documentation.Stephen Kelly2013-06-041-6/+6
| | | | | | |
| * | | | | | Remove unused cmAddDefinitionsCommand::ParseDefinition method.Stephen Kelly2013-06-041-2/+0
| | | | | | |
* | | | | | | Merge topic 'add_compile_options-command'Brad King2013-06-056-1/+177
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a984f32 Introduce add_compile_options command.
| * | | | | | | Introduce add_compile_options command.Stephen Kelly2013-06-046-1/+177
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This command is similar to add_definitions, in that it affects the compile options of all targets which follow it. The implementation is similar to the implementation of the include_directories command, in that it is based on populating a COMPILE_OPTIONS directory property and using that to initialize the same property on targets. Unlike the include_directories command however, the add_compile_options command does not affect previously defined targets. That is, in the following code, foo will not be compiled with -Wall, but bar will be: add_library(foo ...) add_compile_options(-Wall) add_library(bar ...)
* | | | | | | Merge topic 'VISIBILITY_PRESET-property'Brad King2013-06-056-0/+119
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd1fa53 Add a COMPILE_OPTION for a VISIBILITY_INLINES_HIDDEN target property. 0e9f4bc Introduce target property <LANG>_VISIBILITY_PRESET
| * | | | | | | Add a COMPILE_OPTION for a VISIBILITY_INLINES_HIDDEN target property.Stephen Kelly2013-06-022-20/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This corresponds to the g++ and clang++ option -fvisibility-inlines-hidden on linux. On Windows with MinGW, this corresponds to -fno-keep-inline-dllexport. That option is not supported by clang currently.
| * | | | | | | Introduce target property <LANG>_VISIBILITY_PRESETStephen Kelly2013-06-026-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is initialized by CMAKE_<LANG>_VISIBILITY_PRESET. The target property is used as the operand to the -fvisibility= compile option with GNU compilers and clang.
* | | | | | | | CMake Nightly Date StampKitware Robot2013-06-051-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'fix-variable_watch-cases'Brad King2013-06-042-18/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 647745b variable_watch: Print accesses as "CMake Debug Log" messages 515f9af variable_watch: Remove leftover debugging code (#14187) c63d300 variable_watch: Add test for MODIFIED_ACCESS report 3d5bb38 variable_watch: Add missing string enumeration entry (#14188)
| * | | | | | | | variable_watch: Print accesses as "CMake Debug Log" messagesBrad King2013-06-031-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use makefile->IssueMessage() to print the unprocessed watch message in a format consistent with other CMake messages and with a more complete call stack for the access.
| * | | | | | | | variable_watch: Remove leftover debugging code (#14187)Brad King2013-06-031-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a watch does not specify a command to call then variable_watch prints out a message to stderr. Remove code after that which collects all variable values to construct a message that is never printed. Otherwise such code causes a READ_ACCESS watch to trigger on all variables in the currents scope. Reported-by: Yichao Yu <yyc1992@gmail.com>
| * | | | | | | | variable_watch: Add missing string enumeration entry (#14188)Yichao Yu2013-06-031-0/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 9a5b4eba (All variable accesses should produce watch callbacks, 2007-05-17) we added a new enumeration value but did not update the list of strings matching them. Add the missing entry. Without this, variable_watch prints REMOVED_ACCESS instead of MODIFIED_ACCESS when set the value of the variable.
* | | | | | | | Merge topic 'update-kwsys'Brad King2013-06-043-12/+76
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d38db5 bootstrap: Compile KWSys SystemTools with UTIME(S|NSAT) values 884e3ed Merge branch 'upstream-kwsys' into update-kwsys d66f6f3 KWSys 2013-05-31 (dccf7725)
| * | | | | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-06-033-12/+76
| |/ / / / / /
* | | | | | | Merge topic 'cfbundle-location'Brad King2013-06-047-51/+27
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | 483e208 OS X: Fix getting of CFBundle LOCATION property.
| * | | | | | OS X: Fix getting of CFBundle LOCATION property.Clinton Stimpson2013-06-037-51/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bug #13797. The kinds of changes applied in 373faae5 for frameworks are now applied to CFBundle. The prefix and suffix for CFBundles are now handled in cmTarget::GetFullNameInternal.
* | | | | | | CMake Nightly Date StampKitware Robot2013-06-041-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'target-COMPILE_OPTIONS'Brad King2013-06-0318-63/+647
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24466f2 Add target_compile_options command. 80ca9c4 Add COMPILE_OPTIONS target property. 7cb2308 cmTarget: Rename LinkInterfaceIncludeDirectoriesEntries 47f80d9 cmTarget: Rename struct to be more re-usable. 1319a14 Add <LANG>_COMPILER_ID generator expressions. 3549676 Add cmLocalGenerator::GetCompileOptions. f3ad863 VS6: Rename some variables to correspond to config values.
| * | | | | | Add target_compile_options command.Stephen Kelly2013-06-025-0/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This command populates the COMPILE_OPTIONS target property.
| * | | | | | Add COMPILE_OPTIONS target property.Stephen Kelly2013-06-026-1/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method reads generator expressions from the COMPILE_OPTIONS target property, as well as INTERFACE_COMPILE_OPTIONS from linked dependents.
| * | | | | | cmTarget: Rename LinkInterfaceIncludeDirectoriesEntriesStephen Kelly2013-06-021-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used for COMPILE_OPTIONS too.
| * | | | | | cmTarget: Rename struct to be more re-usable.Stephen Kelly2013-06-021-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The same struct can be used to represent COMPILE_OPTIONS content.
| * | | | | | Add <LANG>_COMPILER_ID generator expressions.Stephen Kelly2013-06-022-0/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These expressions evaluate to the id of the compiler used to build the target, or can be used to test if the compiler id matches a specified value.
| * | | | | | Add cmLocalGenerator::GetCompileOptions.Stephen Kelly2013-06-029-25/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently it only adds the contents of the COMPILE_FLAGS target property, but it can be extended to handle a new COMPILE_OPTIONS generator expression enabled property.
| * | | | | | VS6: Rename some variables to correspond to config values.Stephen Kelly2013-06-021-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies population of the compile flags.
* | | | | | | Merge topic 'refactor-try_compile-argument-processing'Brad King2013-06-031-133/+103
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d06db7e try_compile: Refactor argument processing b680824 try_compile: Add test for bad call error cases
| * | | | | | | try_compile: Refactor argument processingBrad King2013-05-311-133/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Process all arguments in a single loop using a simple state machine. While at it, fix some error message typos. Also allow LINK_LIBRARIES with no actual libraries to disable use of the -DLINK_LIBRARIES=... from the CMAKE_FLAGS. This was already possible in the old logic if LINK_LIBRARIES was immediately followed by another keyword argument instead of the end of the argument list, so allow it in general. Update the RunCMake.try_compile test cases accordingly.
* | | | | | | | Merge topic 'vs-RootNamespace'Brad King2013-06-032-0/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cca955a VS: Add VS_GLOBAL_ROOTNAMESPACE target property
| * | | | | | | | VS: Add VS_GLOBAL_ROOTNAMESPACE target propertyJohn Farrier2013-05-312-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a setting for Visual Studio projects for the root namespace in the "Globals" PropertyGroup section of the project file.
* | | | | | | | | Merge topic 'fix-style'Brad King2013-06-032-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e162326 Fix indentation.
| * | | | | | | | | Fix indentation.Stephen Kelly2013-05-292-3/+3
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge topic 'qt4-qt5-CMAKE_AUTOMOC'Brad King2013-06-031-0/+40
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa55751 QtAutomoc: Get the Qt version through the target link interface f776316 Use the qt5::moc imported target instead of a variable.