summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | Strip stray semicolons when evaluating generator expressions.Stephen Kelly2013-02-183-3/+8
| | | |
* | | | Merge topic 'ide-compiler-vars-Fortran'Brad King2013-02-251-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 9f94181 VS: Restore CMAKE_GENERATOR_FC variable
| * | | | VS: Restore CMAKE_GENERATOR_FC variableBrad King2013-02-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit bed6c388 (VS,Xcode: Remove unused CMAKE_GENERATOR_* variables, 2013-02-19) we removed this variable among others from the VS generator claiming they were all not used. In fact the Fortran compiler detection module CMakeDetermineFortranCompiler.cmake uses CMAKE_GENERATOR_FC even for the Visual Studio IDE generators because it does not use the full IDE compiler id detection like the C and C++ language files do.
* | | | | Merge topic 'try_compile-targets'Brad King2013-02-2510-15/+293
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 236133e Handle targets in the LINK_LIBRARIES of try_compile. 1c0597c Add a new Export generator for IMPORTED targets. f2ab17d Keep track of all targets seen while evaluating a genex.
| * | | | | Handle targets in the LINK_LIBRARIES of try_compile.Stephen Kelly2013-02-222-10/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Imported targets are re-exported so that they can be used by the try_compile generated code with target_link_libraries. This makes the use of the cmake_expand_imported_targets macro obsolete. The macro is not able to expand the generator expressions which may appear in the IMPORTED_LINK_INTERFACE_LIBRARIES content. Instead it just sees them as 'not a target'.
| * | | | | Add a new Export generator for IMPORTED targets.Stephen Kelly2013-02-224-0/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to be used during try_compile using LINK_LIBRARIES in the srcfile signature and, in the future, TARGETS in the binary dir signature.
| * | | | | Keep track of all targets seen while evaluating a genex.Stephen Kelly2013-02-224-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As dependencies of the generator expression, these will re-exported in try_compile generated code.
* | | | | | Merge topic 'fix-automoc-linker-language'Brad King2013-02-253-12/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79568f9 automoc: Add source file to target early to set the linker language
| * | | | | | automoc: Add source file to target early to set the linker languageStephen Kelly2013-02-223-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, GetIncludeDirectories was called before calling target->AddSourceFile(mocCppSource). Since commit a1c4905f (Use the link information as a source of compile definitions and includes., 2013-02-12), the include directories are determined by the link information. Valid link information requires that the linker language can be determined, which depends on the source files languages and the dependent targets languages. In the case of the no_link_languages target in the unit test, there are no dependencies and the additional source file no_link_languages_automoc.cpp is added to the target at generate-time. That file can be used to determine the linker language, but it must be added to the target before calling GetIncludeDirectories.
* | | | | | | Merge topic 'ExportFileGenerator_GenerateNicerErrorCheckingCode'Brad King2013-02-251-13/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11d0c66 export files: rewrite the code for checking required targets
| * | | | | | | export files: rewrite the code for checking required targetsAlex Neundorf2013-02-201-13/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of generating a whole bunch of repeated if-statements now a foreach()-loop is generated in the targets-file. Also now a comment is inserted in the generated file if no targets from other export sets are used, so if somebody looks at the file he can see whether the information about missing imported targets has been generated or not. Alex
* | | | | | | | Merge topic 'cmLocalGenerator_RemoveVirtuals'Brad King2013-02-251-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f497dbc cmLocalGenerator: remove "virtual" where not used
| * | | | | | | | cmLocalGenerator: remove "virtual" where not usedAlex Neundorf2013-02-201-5/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes several functions of cmLocalGenerator which are marked as virtual non-virtual, since they are not reimplemented anywhere. Alex
* | | | | | | | CMake Nightly Date StampKitware Robot2013-02-251-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-02-241-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-02-231-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-02-221-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-02-211-1/+1
|/ / / / /
* | | | | Merge topic 'xcode-target-depends'Brad King2013-02-203-51/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b005140 Xcode: Each target dependency edge needs a unique object (#13935) 781ea6d Xcode: Drop check for circular target dependencies
| * | | | | Xcode: Each target dependency edge needs a unique object (#13935)Brad King2013-02-193-33/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate a unique PBXTargetDependency and PBXContainerItemProxy for every edge in the dependency graph as required by the Xcode format. Xcode only accidentally loads project files that re-use the same PBXTargetDependency for every edge leading to a single target. If one is removed by hand in the IDE then Xcode may crash due to dangling references from the others. Since cmGlobalXCodeGenerator::AddDependTarget is called exactly once for every edge in the target dependency graph we do not need to keep track of which edges have been visited to avoid generating duplicates.
| * | | | | Xcode: Drop check for circular target dependenciesBrad King2013-02-191-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The modern cmComputeTargetDepends guarantees there will by no cycles. Drop the Xcode generator's check which only handled length 1 and 2 cycles anyway.
* | | | | | Merge topic 'compiler-change-cleanup'Brad King2013-02-201-16/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e83e6a1 Test Unix Makefiles generator support for changing compilers c307e1c Tests/RunCMake: Allow tests to control build tree behavior 2963c98 Merge branch 'empty-compiler-crash' into compiler-change-cleanup 1df09e5 Delete entire CMakeFiles directory when deleting CMakeCache.txt (#13756)