summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2013-06-031-1/+1
|
* CMake Nightly Date StampKitware Robot2013-06-021-1/+1
|
* CMake Nightly Date StampKitware Robot2013-06-011-1/+1
|
* Merge topic 'fix-try_compile-library-spaces'Brad King2013-05-311-1/+1
|\ | | | | | | | | e537544 try_compile: Trim whitespace from LINK_LIBRARIES entries
| * try_compile: Trim whitespace from LINK_LIBRARIES entriesStephen Kelly2013-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit e65ef08b (try_compile: Fix quoting of libraries in generated CMakeLists.txt, 2013-05-24) added quoting to entries specified in the LINK_LIBRARIES. However, if the input entries contain whitespace padding, that quoted whitespace causes an error in the generated CMakeLists.txt at target_link_libraries. Strictly, it is an error to have space separated entries in the CMAKE_REQUIRED_LIBRARIES, as it was never properly handled by CMakeExpandImportedTargets even prior to commit 236133e7 (Handle targets in the LINK_LIBRARIES of try_compile., 2013-02-09). However, it is causing a regression in KDE code which tests the next branch.
* | Merge topic 'fix-INCLUDE_DIRECTORIES-genex-read'Brad King2013-05-311-37/+77
|\ \ | | | | | | | | | | | | | | | | | | 3aa9ce4 GenexEval: Fix evaluation of INCLUDE_DIRECTORIES target property. 0b39fef GenexEval: Extract a getLinkedTargetsContent from TargetPropertyNode. 53164ac cmTarget: Remove some hardcoding of transitive property names.
| * | GenexEval: Fix evaluation of INCLUDE_DIRECTORIES target property.Stephen Kelly2013-05-301-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This property should come from the content of the property itself, plus the INTERFACE_INCLUDE_DIRECTORIES of the link *implementation*. In contrast, when the INTERFACE_INCLUDE_DIRECTORIES is evaluated for a target, the INTERFACE_INCLUDE_DIRECTORIES of the link *interface* is used. Similar logic applies for the COMPILE_DEFINITIONS target properties. If the propertyName is already an INTERFACE_ variant of the property, ie, the expression is similar to $<TARGET_PROPERTY:foo,INTERFACE_INCLUDE_DIRECTORIES> then the INTERFACE_INCLUDE_DIRECTORIES of the link *interface* of foo is used. However, if the propertyName is not an INTERFACE_ variant, and the interfacePropertyName is, ie, the expression is similar to: $<TARGET_PROPERTY:foo,INCLUDE_DIRECTORIES> then the INTERFACE_INCLUDE_DIRECTORIES of the link *implementation* of foo is used.
| * | GenexEval: Extract a getLinkedTargetsContent from TargetPropertyNode.Stephen Kelly2013-05-301-35/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used to process transitive components of properties which depend on linked targets. Currently only the link interface of the target can be used as the source of the linked targets, but in the next commit it will be possible to use the link implementation as the source of link targets. This commit does not change the semantics of the code.
| * | cmTarget: Remove some hardcoding of transitive property names.Stephen Kelly2013-05-301-2/+17
| | |
* | | CMake Nightly Date StampKitware Robot2013-05-311-1/+1
| | |
* | | Merge topic 'update-kwsys'Brad King2013-05-304-9/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | 2c0c59a Merge branch 'upstream-kwsys' into update-kwsys 9270129 KWSys 2013-05-29 (725e541e)
| * | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-05-294-9/+18
| | | |
* | | | CMake Nightly Date StampKitware Robot2013-05-301-1/+1
|/ / /
* | | CMake Nightly Date StampKitware Robot2013-05-291-1/+1
| | |
* | | Merge topic 'fix-try_compile-library-spaces'Brad King2013-05-281-1/+1
|\ \ \ | | |/ | |/| | | | | | | e65ef08 try_compile: Fix quoting of libraries in generated CMakeLists.txt
| * | try_compile: Fix quoting of libraries in generated CMakeLists.txtBrad King2013-05-241-1/+1
| |/ | | | | | | | | | | | | | | | | | | Since commit 236133e7 (Handle targets in the LINK_LIBRARIES of try_compile, 2013-02-09) libraries passed to the new LINK_LIBRARIES option of try_compile are not quoted inside the generated CMakeLists.txt file. Quote the library names so they re-parse correctly when loaded by CMake to configure and generate the test project. Reported-by: Bogdan Cristea <cristeab@gmail.com>
* | Merge topic 'genex-generate-file'Brad King2013-05-287-0/+359
|\ \ | | | | | | | | | | | | b983a58 file: Add GENERATE command to produce files at generate time
| * | file: Add GENERATE command to produce files at generate timeStephen Kelly2013-05-247-0/+359
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea is to write to a temp file which contains generator expressions, and at generate time, evaluate the generator expressions, and write the result to a file. Because executables on Windows are limited in the length of command line it is possible to use, it is common to write command line arguments to a file instead and specify the file as a source of arguments. This new FILE(GENERATE) subcommand allows the use of generator expressions to create such files so that they can be used with add_custom_command for example.
* | | CMake Nightly Date StampKitware Robot2013-05-281-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2013-05-271-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2013-05-261-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2013-05-251-1/+1
| | |
* | | Merge topic 'language-generator-expressions'Brad King2013-05-245-8/+84
|\ \ \ | | | | | | | | | | | | | | | | 3241014 Add $<LINK_LANGUAGE> generator expression
| * | | Add $<LINK_LANGUAGE> generator expressionStephen Kelly2013-05-245-8/+84
| | | | | | | | | | | | | | | | | | | | | | | | They can't be used when evaluating link libraries, but they can be used for include directories and compile definitions. Later they can be used for compile options.
* | | | CMake Nightly Date StampKitware Robot2013-05-241-1/+1
| | | |
* | | | Merge topic 'xcode-attributes-variant'Brad King2013-05-231-2/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 332350b Xcode: Support XCODE_ATTRIBUTE_ with [variant=<config>] (#12532)
| * | | | Xcode: Support XCODE_ATTRIBUTE_ with [variant=<config>] (#12532)Cédric OCHS2013-05-221-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit c519bb2b (XCode: Also qoute [] as needed to set build-configurations, 2011-04-05) we escape "[]" conditions for XCODE_ATTRIBUTE_ settings. However, we need to handle the "variant" condition with a special case to map it only into the settings for the matching configuration.
* | | | | Merge topic 'xcode-shared-linker-flags-per-config'Brad King2013-05-231-17/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bcda47d Xcode: Honor CMAKE_(MODULE|SHARED)_LINKER_FLAGS_<CONFIG> (#14161)
| * | | | | Xcode: Honor CMAKE_(MODULE|SHARED)_LINKER_FLAGS_<CONFIG> (#14161)Matthew Bentham2013-05-221-17/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Refactor lookup of CMAKE_(EXE|MODULE|SHARED)_LINKER_FLAGS(|_<CONFIG>) variables to ensure all combinations are handled. Use the helper method AddConfigVariableFlags to simplify the implementation.
* | | | | CMake Nightly Date StampKitware Robot2013-05-231-1/+1
| | | | |
* | | | | Merge topic 'join-genex'Brad King2013-05-223-48/+116
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | a7ba452 Add the JOIN generator expression. 96ec314 Make it possible for any genex to have arbitrary content at the end. bd638ee Rename the method determining if a genex accepts arbitrary content. dc742fe Extract the ProcessArbitraryContent method.
| * | | | Add the JOIN generator expression.Stephen Kelly2013-05-162-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This generator expression joins a list with a separator. The separator may contain arbitrary content, such as commas, which is ordinarily a delimiter in the generator expression syntax.
| * | | | Make it possible for any genex to have arbitrary content at the end.Stephen Kelly2013-05-161-1/+14
| | | | |
| * | | | Rename the method determining if a genex accepts arbitrary content.Stephen Kelly2013-05-161-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | The meaning of this will be expanded to generator expressions with more than a single parameter.
| * | | | Extract the ProcessArbitraryContent method.Stephen Kelly2013-05-162-41/+62
| | | | |
* | | | | Merge topic 'LinkLine-typedef'Brad King2013-05-221-2/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 776225d cmTarget: drop the unused local typedef LinkLine
| * | | | | cmTarget: drop the unused local typedef LinkLineRolf Eike Beer2013-05-221-2/+0
| | |/ / / | |/| | |
* | | | | Merge topic 'wizard-cleanup'Brad King2013-05-221-7/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eca523f wizard: simplify control flow f1d27bf wizard: fix warnings
| * | | | | wizard: simplify control flowRolf Eike Beer2013-05-221-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking if a byte is 0 before checking it for something else doesn't do anything useful. Also one can be sure that it can't be anything wanted if the value was set to 0 immediately before.
| * | | | | wizard: fix warningsRolf Eike Beer2013-05-211-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .../Source/cmakewizard.cxx: In member function ‘virtual void cmakewizard::AskUser(const char*, cmCacheManager::CacheIterator&)’: .../Source/cmakewizard.cxx:31:35: warning: conversion to ‘int’ from ‘long unsigned int’ may alter its value [-Wconversion] if(!fgets(buffer, sizeof(buffer)-1, stdin)) ^ .../Source/cmakewizard.cxx: In member function ‘virtual bool cmakewizard::AskAdvanced()’: .../Source/cmakewizard.cxx:70:35: warning: conversion to ‘int’ from ‘long unsigned int’ may alter its value [-Wconversion] if(!fgets(buffer, sizeof(buffer)-1, stdin)) The compiler is (partly) right here: sizeof() returns a size_t, which often is bigger as as int as it is unsigned long or something similar. Add an explicit cast to get rid of that warning here, the buffer has a size of 4KiB, so the value will fit into an int on all sane platforms.
* | | | | Merge topic 'ctest-parallel-env'Brad King2013-05-223-1/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | db43502 CTest: Read CTEST_PARALLEL_LEVEL from environment
| * | | | | CTest: Read CTEST_PARALLEL_LEVEL from environmentStephen Kelly2013-05-213-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no explicit "-j <n>" option is given on the command line then read the parallel level from an environment variable.
* | | | | | Merge topic 'string-MAKE_C_IDENTIFIER-subcommand'Brad King2013-05-222-1/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ab50ae string: Add MAKE_C_IDENTIFIER subcommand
| * | | | | | string: Add MAKE_C_IDENTIFIER subcommandStephen Kelly2013-05-212-1/+27
| | |_|_|/ / | |/| | | |
* | | | | | Merge topic 'add-EXPORT_NAME-property'Brad King2013-05-225-10/+57
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b5d6f5d Add EXPORT_NAME property.
| * | | | | | Add EXPORT_NAME property.Stephen Kelly2013-05-185-10/+57
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for example, the buildsystem to use names like 'boost_any' instead of the overly generic 'any', and still be able to generate IMPORTED targets called 'boost::any'.
* | | | | | CMake Nightly Date StampKitware Robot2013-05-221-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'fix-include_directories-whitespace-handling'Brad King2013-05-211-2/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2f84dfe include_directories: Fix handling of empty or space-only entries
| * | | | | include_directories: Fix handling of empty or space-only entriesStephen Kelly2013-05-211-2/+13
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a regression introduced in commit 0d46e9a0 (Store includes from the same include_directories call together., 2013-01-20). Reported at http://thread.gmane.org/gmane.comp.programming.tools.cmake.user/46695/focus=7847
* | | | | Merge topic 'fix-genex-comma-parse'Brad King2013-05-211-5/+4
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | 05bf972 Fix handling of commas in arbitrary content in genexes.