summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'export-EXPORT-subcommand'Brad King2014-01-0218-88/+237
|\ | | | | | | | | | | | | | | 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)
| * Help: Document export(EXPORT) in the cmake-packages manual.Stephen Kelly2013-12-241-2/+20
| |
| * Don't copy find_dependency in configure_package_config_file.Stephen Kelly2013-12-242-11/+4
| | | | | | | | | | | | | | There is not really any need to. Downstreams can either rely on it being provided by CMake, or copy and distribute it. Change the documented include for the find_dependency macro.
| * Help: cmake-packages: Add missing slash.Stephen Kelly2013-12-241-1/+1
| |
| * export: Implement EXPORT subcommand (#9822)Stephen Kelly2013-12-2416-74/+212
| | | | | | | | | | | | 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 'cmake-mode-updates'Brad King2014-01-021-5/+11
|\ \ | | | | | | | | | | | | | | | 33fa10f cmake-mode.el: Add autoload cookies d03a0fb cmake-mode.el: Move header line to the top of file
| * | cmake-mode.el: Add autoload cookiesYasuyuki Oka2014-01-021-4/+9
| | |
| * | cmake-mode.el: Move header line to the top of fileYasuyuki Oka2014-01-021-1/+2
| | |
* | | 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-025-1/+110
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 950d76e CPackWiX: allow and convert UTF-8 sequences in RTF writer
| * | | | CPackWiX: allow and convert UTF-8 sequences in RTF writerNils Gladitz2013-12-265-1/+110
| | | | |
* | | | | 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 'suppress-LNK4089-SHELL32'Brad King2014-01-021-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0fd172c CTestCustom: Suppress LNK4089 warning about SHELL32
| * | | | | | CTestCustom: Suppress LNK4089 warning about SHELL32Brad King2014-01-021-0/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a warning suppression regex to match: LINK : warning LNK4089: all references to 'SHELL32.DLL' discarded by /OPT:REF
* | | | | | 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
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | KWSys 2013-12-21 (e81f2a9e)KWSys Robot2013-12-233-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ e81f2a9e | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 2426b57d..e81f2a9e Clinton Stimpson (1): e81f2a9e FStream: Fix opening non-existant file. Change-Id: I1f79e6671de7733d1b8e8a34ce627749c2f666b7
* | | | | | | | Merge topic 'fix-ctest-regressions'Brad King2014-01-026-4/+179
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-236-4/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0230-14/+223
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d25ad48 OS X: Add CMP0042 to enable MACOSX_RPATH by default
| * | | | | | | | | OS X: Add CMP0042 to enable MACOSX_RPATH by defaultClinton Stimpson2014-01-0230-14/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adding documentation for CMAKE_MACOSX_RPATH, and improving documentation for MACOSX_RPATH.
* | | | | | | | | | Merge topic 'copyright-year'Brad King2014-01-021-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2ec464 Copyright.txt: Update year range to end in 2014
| * | | | | | | | | | Copyright.txt: Update year range to end in 2014Brad King2014-01-021-1/+1
| | | | | | | | | | |
* | | | | | | | | | | 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 'MakeDocsWorkWithDocutilsBefore0_11'Brad King2013-12-231-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fb107d8 Help: Fix Sphinx extension with docutils < 0.11
| * | | | | Help: Fix Sphinx extension with docutils < 0.11Alex Neundorf2013-12-231-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In older versions of python docutils "error_reporting" was not in the "utils" subpackage, so try the older location if the new one failed. Alex
* | | | | | Merge topic 'doc-organize-index'Brad King2013-12-231-11/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12862e9 Help: Simplify top-level index organization
| * | | | | | Help: Simplify top-level index organizationBrad King2013-12-201-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise the organization introduced in commit 2c7cd95c (Help: Organize top-level index, 2013-10-28) to drop "Other Manuals" and put them in "Reference Manuals" because the distinction between them has blurred. Perhaps a better breakdown of the reference manuals will emerge in the future. While at it, sort the reference manual toctree by name.
* | | | | | | 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
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | KWSys 2013-12-19 (2426b57d)KWSys Robot2013-12-203-0/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 2426b57d | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 88165c5e..2426b57d Clinton Stimpson (1): 2426b57d Encoding: Add support for program arguments argc/argv. Change-Id: Id1fbc042a093b1de398753ffa16d4f9449e99423
* | | | | | | 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.
generated by cgit v0.12 at 2025-02-13 13:54:43 (GMT)