summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* cmTarget: Don't repeat property origin debug information.Stephen Kelly2014-01-041-6/+0
|
* cmTarget: Fix debug report for interface-set compatibility types.Stephen Kelly2014-01-041-30/+61
| | | | | | | | | | | | | | | | If the dependent target sets the property to boolean false, ensure that that appears in the debug report. Previously, the report output contained whether the property was consistent among dependencies, displaying 'TRUE', instead of the content of the property, which may be 'FALSE'. Return a std::pair from the consistentProperty method. This makes it possible to make the return value for string types easier to reason about. The return value of consistentProperty was previously set to an empty static string to emulate a 'true' value for the caller in commit 816b4a8a (cmTarget: Make consistentProperty return consistent content., 2013-10-22). The pair makes the consistency result properly typed.
* cmTarget: Fix reporting interface-set properties which are FALSE.Stephen Kelly2014-01-041-1/+1
|
* cmTarget: Fix the property compatibility error messageStephen Kelly2014-01-041-1/+2
| | | | | | | Don't refer to 'both', but a 'mixture'. List all compatible interface property types possible. Add another test for a mixture of three compatibilities.
* cmTarget: Don't update IMPORTED target compilation propertiesStephen Kelly2014-01-042-24/+26
| | | | | | The include_directories() and add_compile_options() commands should not append to the corresponding target property for IMPORTED targets. This is already the case for add_definitions().
* get_property: Fix testing ALIASED_TARGET target property (#14670)Stephen Kelly2014-01-041-1/+1
| | | | | In the case where the argument is not an ALIAS, the variable should be set to a -NOTFOUND content.
* export: Only generate and install configuration files if needed.Stephen Kelly2014-01-041-6/+15
| | | | | | | | | | The modern way to create configuration dependent content is using generator expressions in the main export file. The only non-deprecated property still generated in the configuration-specific files are IMPORTED_LOCATION_<CONFIG> INTERFACE_LIBRARY targets have no location, and no need for those files.
* cmTarget: Rename container holding link implementation objects.Stephen Kelly2014-01-041-14/+14
| | | | | Don't erroneously name it for the link implementation. That's something different.
* install: Rename variable referencing cmake version.Stephen Kelly2014-01-041-3/+3
| | | | | | | | The next version is 3.0.0, not 2.8.13. The version generated in the export file should be updated in the release branch in both cmExportInstallFileGenerator and cmExportBuildFileGenerator.
* Style: Use this-> when invoking member function.Stephen Kelly2014-01-041-1/+1
|
* add_dependencies: Disallow use with INTERFACE_LIBRARY.Stephen Kelly2014-01-041-0/+9
|
* CMake Nightly Date StampKitware Robot2014-01-031-1/+1
|
* Merge topic 'export-EXPORT-subcommand'Brad King2014-01-024-59/+148
|\ | | | | | | | | | | | | | | 98b9f52 Help: Document export(EXPORT) in the cmake-packages manual. a1d2bda Don't copy find_dependency in configure_package_config_file. f4f6529 Help: cmake-packages: Add missing slash. cbe7e8f export: Implement EXPORT subcommand (#9822)
| * export: Implement EXPORT subcommand (#9822)Stephen Kelly2013-12-244-59/+148
| | | | | | | | | | | | Teach the export command to handle export sets defined by invocations of install(TARGETS ... EXPORT foo). This makes maintenance of targets exported to both the build tree and install tree trivial.
* | Merge topic 'KateProjectImprovements'Brad King2014-01-021-8/+19
|\ \ | | | | | | | | | | | | | | | | | | 37104d9 kate: put full path to cmake into comment 424d5dc kate: support also the build plugin in kate <= 4.12 8bd6cf0 kate: the prev_target is not used by kate
| * | kate: put full path to cmake into commentAlex Neundorf2013-12-291-1/+2
| | | | | | | | | | | | Alex
| * | kate: support also the build plugin in kate <= 4.12Alex Neundorf2013-12-291-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch, simply also the information used by the build plugin in kate <= 4.12 is put into the generated json file. The new build plugin (coming in 4.13) simply ignores this (and vice versa). Alex
| * | kate: the prev_target is not used by kateAlex Neundorf2013-12-291-1/+0
| | | | | | | | | | | | | | | | | | ...this was a leftover from experimenting Alex
* | | Merge topic 'wix-rtf-encoding'Brad King2014-01-022-1/+98
|\ \ \ | | | | | | | | | | | | | | | | 950d76e CPackWiX: allow and convert UTF-8 sequences in RTF writer
| * | | CPackWiX: allow and convert UTF-8 sequences in RTF writerNils Gladitz2013-12-262-1/+98
| | | |
* | | | Merge topic 'wix-read-only'Brad King2014-01-021-0/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 44a7543 CPackWiX: transfer file read only flag during installation
| * | | | CPackWiX: transfer file read only flag during installationNils Gladitz2013-12-251-0/+11
| | | | |
* | | | | Merge topic 'fix-compile-OBJECT_DIR'Brad King2014-01-024-16/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 03f3b4e Replace <OBJECT_DIR> rule placeholder consistently (#14667)
| * | | | | Replace <OBJECT_DIR> rule placeholder consistently (#14667)Brad King2014-01-024-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The <OBJECT_DIR> placeholder is supposed to be the base intermediate files directory for the current target. This is how it gets replaced during link line generation. However, during compile line generation we replace it with the directory containing the current object file which may be a subdirectory. Fix replacement of <OBJECT_DIR> in the generated compile lines to be the base intermediate files directory. This was expoxed by commit 42ba1b08 (VS: Separate compiler and linker PDB files, 2013-04-05) when we added a "/Fd<OBJECT_DIR>/" flag to the MSVC compile line in order to match the VS IDE default compiler program database location in the intermediate files directory. For source files in a subdirectory relative to the current target this caused the wrong location to be used for the compiler program database. This becomes particularly important when using precompiled headers. While at it, use the cmTarget::GetSupportDirectory method to compute the intermediate files directory for the current target instead of repeating the logic in a few places.
* | | | | | Merge topic 'update-kwsys'Brad King2014-01-023-2/+56
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f7c169 Merge branch 'upstream-kwsys' into update-kwsys d4efa5f KWSys 2013-12-21 (e81f2a9e)
| * | | | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-12-233-2/+56
| | |_|_|_|/ | |/| | | |
* | | | | | Merge topic 'fix-ctest-regressions'Brad King2014-01-022-4/+89
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f0d4af CTest: fix regressions introduced by the ctest-fix-run-serial topic
| * | | | | | CTest: fix regressions introduced by the ctest-fix-run-serial topicNils Gladitz2013-12-232-4/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first regression resulted in endless looping due to unrun test dependencies. The second regression prioritized all tests with dependencies in serial test runs.
* | | | | | | Merge topic 'rpath-default'Brad King2014-01-029-8/+125
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d25ad48 OS X: Add CMP0042 to enable MACOSX_RPATH by default
| * | | | | | | OS X: Add CMP0042 to enable MACOSX_RPATH by defaultClinton Stimpson2014-01-029-8/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adding documentation for CMAKE_MACOSX_RPATH, and improving documentation for MACOSX_RPATH.
* | | | | | | | CMake Nightly Date StampKitware Robot2014-01-021-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-01-011-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2013-12-311-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2013-12-301-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-291-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-281-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-271-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-12-261-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2013-12-251-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-12-241-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'update-kwsys'Brad King2013-12-233-0/+155
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | f4fcfc6 Merge branch 'upstream-kwsys' into update-kwsys 7aa3c20 KWSys 2013-12-19 (2426b57d)
| * | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-12-203-0/+155
| | |/ / | |/| |
* | | | Merge topic 'wix-cmake-coding-conventions'Brad King2013-12-238-108/+108
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 37a1157 CPackWiX: adhere to CMake member naming convention
| * | | | CPackWiX: adhere to CMake member naming conventionNils Gladitz2013-12-208-108/+108
| |/ / /
* | | | Merge topic 'fix-Qt-rcc-file-handling'Brad King2013-12-231-1/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 870bd16 QtAutogen: Don't modify target source files while iterating them.
| * | | | QtAutogen: Don't modify target source files while iterating them.Stephen Kelly2013-12-201-1/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Populate a separate vector of files and append them separately. This was the pattern used prior to commit 035b6908 (Autogen: Split AutoRcc handling into two methods, 2013-12-10), which was erroneously not maintained in that refactoring.
* | | | Merge topic 'vs-external-project-type'Brad King2013-12-233-2/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a79cbdc VS: Teach include_external_msproject about non-C++ projects (#14661)
| * | | | VS: Teach include_external_msproject about non-C++ projects (#14661)David Golub2013-12-203-2/+39
| |/ / / | | | | | | | | | | | | | | | | | | | | Teach CMake to guess the project type guid based on the project file extension. This allows non-C++ projects like *.vbproj or *.csproj to be included.
* | | | Merge topic 'remove-VTK-include-hack'Brad King2013-12-231-21/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | db7d111 cmLocalGenerator: Remove VTK include hack (#11338).
| * | | | cmLocalGenerator: Remove VTK include hack (#11338).Stephen Kelly2013-12-201-21/+0
| |/ / / | | | | | | | | | | | | | | | | This exists for pre-CMake 2.4 compatibility. All such compatibility code was removed for CMake 3.0, so remove this too.