summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Add $<SEMICOLON> generator expression.Jean-Christophe Fillion-Robin2013-03-122-0/+20
| | | | | This expression is useful to put a ';' in a command line argument without dividing the argument during CMake list expansion.
* Merge topic 'ninja-mingw-lang'Brad King2013-03-124-86/+46
|\ | | | | | | | | | | 2271ca3 Ninja: the Ninja generator does not support Fortran yet. 751f712 Ninja: use MinGW generator code in EnableLanguage()
| * Ninja: the Ninja generator does not support Fortran yet.Peter Kümmel2013-03-101-5/+11
| |
| * Ninja: use MinGW generator code in EnableLanguage()Peter Kümmel2013-03-094-84/+38
| |
* | Merge topic 'install-export-usr-move'Brad King2013-03-122-9/+29
|\ \ | | | | | | | | | | | | 0c727b9 install(EXPORT): Force absolute paths for usr-move
| * | install(EXPORT): Force absolute paths for usr-moveBrad King2013-03-082-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the absolute install(EXPORT) destination for the CMAKE_INSTALL_PREFIX used during configuration is under (/usr)?/lib(64)? then assume the current build is for a system package installation instead of a relocatable distribution. Generate an absolute path for _IMPORT_PREFIX in the target exports file instead of generating code to compute the value relative to the file location. This is necessary for distributions implementing a move to /usr such as: https://wiki.archlinux.org/index.php/DeveloperWiki:usrlib "All files in the /lib directory have been moved to /usr/lib and now /lib is a symlink to usr/lib." The relative path computation is not reliable because the targets file could be installed through cross-prefix a symlink and loaded without it or vice versa. A similar change was made for package configuration file generation by commit d4774140 (configure_package_config_file: force absolute paths for usr-move, 2013-01-24).
* | | Merge topic 'vs7-empty-groups'Brad King2013-03-122-8/+22
|\ \ \ | | | | | | | | | | | | | | | | 545fdec VS: Avoid empty source groups in some cases (#3474)
| * | | VS: Avoid empty source groups in some cases (#3474)Anton Helwart2013-03-082-8/+22
| |/ / | | | | | | | | | | | | | | | Teach the WriteGroup method return true if a group or any of its children have source files. Have children write their output to a temporay cmOStringStream. Add it to the real output only if not empty.
* | | Merge topic 'cpack-nsis-no-release-version'Brad King2013-03-121-12/+24
|\ \ \ | | | | | | | | | | | | | | | | 7947890 CPack: Fix NSIS version check without release version (#9721)
| * | | CPack: Fix NSIS version check without release version (#9721)Gerald Hofmann2013-03-081-12/+24
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Only check a release version for the minimum required version. If NSIS returns a CVS build version string (as when built by Macports), skip the version check altogether and assume a sufficiently new version. Also correctly handle the case where the version check fails and the CPACK_TOPLEVEL_DIRECTORY option is not set. Co-Author: Graham Menhennitt <graham@menhennitt.com.au>
* | | Merge topic 'fix-transitive-target-names'Brad King2013-03-122-3/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | 1bdd167 Restore support for target names with '+' (#13986) 254687d Only process transitive interface properties for valid target names.
| * | | Restore support for target names with '+' (#13986)Stephen Kelly2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the range of valid target names with the + sign. This character can commonly be used for target names, such as those containing 'c++'. Add a test but skip it for Borland and Watcom tools which do not support the character. Suggested-By: Benjamin Kloster
| * | | Only process transitive interface properties for valid target names.Stephen Kelly2013-03-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit a1c4905f (Use the link information as a source of compile definitions and includes., 2013-02-12) introduced the use of link information as the source of target properties via the TARGET_PROPERTY generator expression. This generator expression has a strict interpretation of a valid target name and emits a fatal error for invalid names. Ensure that only targets with names valid for use with TARGET_PROPERTY or targets which are determined by generator expressions are processed by it. This means that at worst, invalid target names do not participate in the transitive evaluation of properties, but the validation generator expression can be extended where needed to resolve that.
* | | | Merge topic 'update-find_package-docs'Brad King2013-03-121-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | b73e05d Mention that IMPORTED targets may be created by a find_package call.
| * | | | Mention that IMPORTED targets may be created by a find_package call.Stephen Kelly2013-03-061-1/+2
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-03-121-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-03-111-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-03-101-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2013-03-091-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2013-03-081-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2013-03-071-1/+1
| |/ |/|
* | CMake Nightly Date StampKitware Robot2013-03-061-1/+1
| |
* | Merge topic 'vs10-stack-size'Brad King2013-03-051-1/+1
|\ \ | | | | | | | | | | | | 308c5a2 VS 10: Fix CMAKE_<LANG>_STACK_SIZE implementation (#13968)
| * | VS 10: Fix CMAKE_<LANG>_STACK_SIZE implementation (#13968)Brad King2013-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use the /STACK: flag to pass the value through flag parsing so that the generator converts it to the StackReserveSize project file option. The option was accidentally left out by commit 7491f529 (first pass at VS 10, 2009-06-25). Suggested-by: goatboy160@yahoo.com
* | | CMake Nightly Date StampKitware Robot2013-03-051-1/+1
| |/ |/|
* | Merge topic 'fix-genex-RPATH-handling'Brad King2013-03-043-6/+11
|\ \ | | | | | | | | | | | | dcb5907 Fix RPATH information when only a genex is used as a link library.
| * | Fix RPATH information when only a genex is used as a link library.Stephen Kelly2013-02-283-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | As of commit 1da75022 (Don't include generator expressions in old-style link handling., 2012-12-23), such entries are not included in the LinkLibraries member. Generator expressions in LinkLibraries are not processed anyway, so port to the new way of getting link information.
* | | Merge topic 'fix-genex-split-duplication'Brad King2013-03-041-2/+10
|\ \ \ | | | | | | | | | | | | | | | | f93a388 Fix the cmGeneratorExpression::Split when leading chars are present.
| * | | Fix the cmGeneratorExpression::Split when leading chars are present.Stephen Kelly2013-02-281-2/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of input like foo$<1:bar> the preGenex should be 'foo'. In that case, the search for a ';' will not find one, and there is no preceding input to process as a non-genex list. Previously, the result of 'splitting' such a string would instead be a vector containing the same string two times.
* | | Merge topic 'ctest_update-Git-HEAD'Brad King2013-03-041-2/+2
|\ \ \ | | | | | | | | | | | | | | | | 78b81b7 CTest: Fix ctest_update with 'HEAD' file in source tree
| * | | CTest: Fix ctest_update with 'HEAD' file in source treeBrad King2013-02-281-2/+2
| |/ / | | | | | | | | | | | | Add the '--' command-line separator to make the HEAD reference unambiguous. Extend the CTest.UpdateGIT test to cover this case.
* | | Merge topic 'xcode-COMBINE_HIDPI_IMAGES'Brad King2013-03-041-0/+2
|\ \ \ | | | | | | | | | | | | | | | | 10d7bf4 Xcode: Generate recommended artwork setting (#13954)
| * | | Xcode: Generate recommended artwork setting (#13954)Brad King2013-02-261-0/+2
| | | | | | | | | | | | | | | | | | | | Add the COMBINE_HIDPI_IMAGES = YES setting to all Xcode project targets. Otherwise Xcode may ask the user to "Update to recommended settings".
* | | | Merge topic 'remove-TARGET_DEFINED-genex'Brad King2013-03-042-19/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | cbf0756 Revert "Add the TARGET_DEFINED generator expression" 21a342c Remove use of TARGET_DEFINED from the target_link_libraries test. 47b8d32 Remove use of TARGET_DEFINED from the ExportImport test. 2e39d21 Remove use of TARGET_DEFINED from target_include_directories test.
| * | | Revert "Add the TARGET_DEFINED generator expression"Stephen Kelly2013-02-252-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2bee6f5ba5b3f33817cc00e056a7df60d05c9399. This expression is not used, and has a semantic which is not completely optimal (namely considering utility targets to be targets, though usually we are interested in linkable targets). Remove it so that we have more freedom to define better expressions in the future. Conflicts: Source/cmGeneratorExpressionEvaluator.cxx Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt Tests/CMakeCommands/target_compile_definitions/consumer.cpp
* | | | CMake Nightly Date StampKitware Robot2013-03-041-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2013-03-031-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2013-03-021-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2013-03-011-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2013-02-281-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2013-02-271-1/+1
| |/ |/|
* | CMake Nightly Date StampKitware Robot2013-02-261-1/+1
| |
* | Merge topic 'memoize-link-iface-includes-defines'Brad King2013-02-251-44/+88
|\ \ | | | | | | | | | | | | 42ebb18 Memoize includes and defines from interface libraries.
| * | Memoize includes and defines from interface libraries.Stephen Kelly2013-02-241-44/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is similar in spirit to commit e48d8420 (Cache context-independent includes on evaluation., 2013-02-03), but it is needed since commit a1c4905f (Use the link information as a source of compile definitions and includes., 2013-02-12), which changed how includes and defines are determined. As they are now determined through the link interface, we need to cache the result of evaluating them through that. In the case of the includes, the result was already being cached and then immediately disposed. Store the result as a member variable instead to make use of the caching.
* | | Merge topic 'interface-property-external-read'Brad King2013-02-255-46/+73
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8dfdf1c Fix the tests for evaluating includes and defines. 98a6725 Fix constness of accessors. 7e70744 Expand includes and defines transitively in 'external' genexes. d1a2729 Fix DAG checker finding cycling dependencies. e72eaad Workaround broken code where a target has itself in its link iface. ec2c67b Strip stray semicolons when evaluating generator expressions.
| * | | Fix the tests for evaluating includes and defines.Stephen Kelly2013-02-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should also check whether the INTERFACE_ variant of a property is being read, and in the case of the compile definitions, we should test the _<CONFIG> suffixed variants. That is already available through the use of the methods. This way, we use the ALREADY_SEEN optimization when evaluating the includes of a target in 'external' generator expressions, ie, those used in a add_custom_command invokation, as opposed to evaluating the INCLUDE_DIRECTORIES of a target itself via GetIncludeDirectories.
| * | | Fix constness of accessors.Stephen Kelly2013-02-232-4/+4
| | | |
| * | | Expand includes and defines transitively in 'external' genexes.Stephen Kelly2013-02-231-36/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means that we can use expressions of the form $<TARGET_PROPERTY:foo,INTERFACE_INCLUDE_DIRECTORIES> to get a list of the interface include directories of foo, including those coming from dependencies. We can't have a test of a target which has a single include directory in its INCLUDE_DIRECTORIES because the shell on the MSYS platforms transforms a single include directory to include a prefix, which is not what the test expects. We test a target with two directories instead as a means to test a target with no link dependencies.
| * | | Fix DAG checker finding cycling dependencies.Stephen Kelly2013-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this patch, the following is reported falsely as a self-reference: target_link_libraries(empty2 LINK_PUBLIC empty3) target_link_libraries(empty3 LINK_PUBLIC empty2) add_custom_target(... -DINCLUDES=$<TARGET_PROPERTY:empty2,INTERFACE_INCLUDE_DIRECTORIES> ) The reason is that the existing code assumed that all reading of include directories would be done through cmTarget::GetIncludeDirectories() and would therefore be initialized with a DagChecker. That is not the case if reading the property with an 'external' generator expression.
| * | | Workaround broken code where a target has itself in its link iface.Stephen Kelly2013-02-231-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a test for this since commit 8e756d2b (Tolerate cycles in shared library link interfaces (#12647), 2012-01-12), so make sure it continues to pass, even as we require no self-references in new INTERFACE_ property generator expressions.