summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMakeLists: Generate the cmCommands.cxx file.Stephen Kelly2014-02-097-89/+82
| | | | | | | | | | | | Define the list of commands in the CMakeLists.txt file. List the sources in the CMakeLib target, but mark them as HEADER_FILE_ONLY. This has the effect that IDEs will show the files, though they will not be built again. Add a cmCommandsForBootstrap.cxx file for bootstrapping purposes. Rename the cmExportLibraryDependencies file to match the common pattern.
* CMake Nightly Date StampKitware Robot2014-02-091-1/+1
|
* CMake Nightly Date StampKitware Robot2014-02-081-1/+1
|
* CMake Nightly Date StampKitware Robot2014-02-071-1/+1
|
* Merge topic 'update-buildsystem-docs'Brad King2014-02-0643-482/+811
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc46b702 Help: Adjust the QtAutogen properties to the common style. f371545d Help: Use ``True`` and ``False`` for IMPORTED values. 3879c847 Help: Document relation of properties to the rest of the buildsystem. ba4c2fa8 Help: Mark up the buildsystem commands documentation a683262a Help: Note that the compatible interface properties must not intersect. fbe01bed Help: Specify how to order and modify transitively set property values. 645500b4 Help: Add hyperlink targets to some manual sections. 85a4fad7 Help: Use ``inline-literals`` to mark generator expressions. a0fa0253 Help: Mark up references to NEW and OLD policy settings properly. 6c02e7f4 Help: Add a style guide. 91fbff88 Help: Fix typos
| * Help: Adjust the QtAutogen properties to the common style.Stephen Kelly2014-02-067-38/+59
| | | | | | | | Link to the cmake-qt manual.
| * Help: Use ``True`` and ``False`` for IMPORTED values.Stephen Kelly2014-02-061-3/+3
| | | | | | | | Only the first letter is capitalized. It is marked up.
| * Help: Document relation of properties to the rest of the buildsystem.Stephen Kelly2014-02-0621-144/+203
| |
| * Help: Mark up the buildsystem commands documentationStephen Kelly2014-02-069-283/+334
| | | | | | | | Cross-link to the cmake-buildsystem manual.
| * Help: Note that the compatible interface properties must not intersect.Stephen Kelly2014-02-061-0/+4
| |
| * Help: Specify how to order and modify transitively set property values.Stephen Kelly2014-02-061-1/+21
| |
| * Help: Add hyperlink targets to some manual sections.Stephen Kelly2014-02-061-0/+9
| | | | | | | | | | These can be refered to from the command documentation and other relevant locations.
| * Help: Use ``inline-literals`` to mark generator expressions.Stephen Kelly2014-02-0613-13/+13
| |
| * Help: Mark up references to NEW and OLD policy settings properly.Stephen Kelly2014-02-061-4/+4
| |
| * Help: Add a style guide.Stephen Kelly2014-02-061-2/+167
| |
| * Help: Fix typosStephen Kelly2014-02-062-2/+2
|/ | | | | | | | Psuedo -> Pseudo behaviour -> behavior CMake uses American spelling.
* Merge topic 'FindOpenSSL-root-dir'Brad King2014-02-061-4/+5
|\ | | | | | | | | 12d6eb63 FindOpenSSL: Honor OPENSSL_ROOT_DIR everywhere (#14735)
| * FindOpenSSL: Honor OPENSSL_ROOT_DIR everywhere (#14735)Ho Cheung2014-02-051-4/+5
| | | | | | | | | | | | In commit v2.8.5~176^2~2 (FindOpenSSL: We should only use hints to find OpenSSL, 2011-03-28) values for HINTS and PATHS of find_* calls were computed everywhere but only used on Windows. Use them everywhere.
* | Merge topic 'Qt4-WIN32-doc'Brad King2014-02-061-1/+2
|\ \ | | | | | | | | | | | | 0f5dfd10 Help: Specify that qtmain.lib is only used for WIN32 executables.
| * | Help: Specify that qtmain.lib is only used for WIN32 executables.Stephen Kelly2014-02-051-1/+2
| |/
* | Merge topic 'fix-Qt-autogen'Brad King2014-02-063-13/+28
|\ \ | | | | | | | | | | | | 8f8edeb0 QtAutogen: Only add source files to the target if AUTORCC is ON.
| * | QtAutogen: Only add source files to the target if AUTORCC is ON.Stephen Kelly2014-02-053-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qtx_add_resources() macro adds the resource file to the output list to maintain file-level dependencies. Having the qrc file in a target sources is a precondition for AUTORCC to function. When processing the source files of a target, only add the generated qrc_<file>.cpp to the target sources if AUTORCC is ON. This avoids pre-porting conflict with the macro. Reported-by: Micha Hergarden
* | | CMake Nightly Date StampKitware Robot2014-02-061-1/+1
| |/ |/|
* | Merge topic 'doc-version-components'Brad King2014-02-055-20/+50
|\ \ | | | | | | | | | | | | 52e7beb6 Help: Expand documentation of CMAKE_VERSION and related variables
| * | Help: Expand documentation of CMAKE_VERSION and related variablesBrad King2014-02-055-20/+50
| |/ | | | | | | | | | | | | | | | | | | | | Describe the meaning of each version component in more detail in the documentation of CMAKE_VERSION. Simplify the per-component version variable documentation by referencing the main variable. Include information about how to compare version strings. Also add an historical note about the version scheme used prior to commit v2.8.2~105^2~4 (New version scheme to support branchy workflow, 2010-04-23).
* | Merge topic 'no-policy-tweak-version'Brad King2014-02-052-70/+54
|\ \ | | | | | | | | | | | | 101057b5 Drop tweak version component from CMake Policies
| * | Drop tweak version component from CMake PoliciesBrad King2014-02-042-70/+54
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.2~105^2~2 (Teach CMake Policies about tweak version component, 2010-04-23), cmPolicies has known how to handle a policy introduced in a tweak version. This was done back when we introduced policies with the current development date version and later updated it to the release version. Now we always introduce policies using the next expected release version and explicitly set the policy to test the NEW behavior. CMake Policies (or any other features) should never be introduced in a tweak (bugfix) release, so drop the infrastructure that allows this.
* | Merge topic 'release-notes'Brad King2014-02-055-1/+54
|\ \ | | | | | | | | | | | | | | | | | | ccc87047 Help: Add documents to collect notes between releases 70309e70 Help: Add documents for release notes 34ea1f15 Utilities/Sphinx: Add option to build 'text' format
| * | Help: Add documents to collect notes between releasesBrad King2014-02-043-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a release/dev.txt file and include it from release/index.rst in development versions. Add a "Changes Since Release" section with a toctree that globs adjacent "dev/*" documents. Add a sample topic document explaining how topic-specific release note documents work. This approach will allow developers to write release notes for their changes as they are made. The release manager may then consolidate and organize the notes for a specific release version.
| * | Help: Add documents for release notesBrad King2014-02-042-0/+18
| | | | | | | | | | | | | | | | | | Add a release/index.rst document titled "CMake Release Notes" to hold the toctree for release notes. Add a "Release Notes" section to the top-level html document index to link to the new document.
| * | Utilities/Sphinx: Add option to build 'text' formatBrad King2014-02-041-1/+7
| | | | | | | | | | | | | | | | | | | | | Add SPHINX_TEXT to enable the Sphinx 'text' builder. Mark it as advanced and do not add install rules. This is intended for use by the release manager to build the release notes in text format suitable for email.
* | | Merge topic 'AUTOMOC-docs'Brad King2014-02-051-2/+5
|\ \ \ | | | | | | | | | | | | | | | | 635e96dd Help: Be clearer about which header files are considered for AUTOMOC
| * | | Help: Be clearer about which header files are considered for AUTOMOCAlex Merry2014-02-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old documentation stated that "all header files" were considered, which was not true for any sensible definition of "all header files". Only header files with certain names are considered. Document the filename patterns matched for parsing.
* | | | Merge topic 'FeatureSummary-no-transitive'Brad King2014-02-053-0/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a6971f65 FeatureSummary: Don't list transitive package dependencies
| * | | | FeatureSummary: Don't list transitive package dependenciesStephen Kelly2014-02-033-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set a global property in the find_package implementation. Track and reset that property in the find_dependency macro. Read the property in FeatureSummary when determining whether to print output. This means that packages which are found only as dependencies are not listed by FeatureSummary, but if a project uses find_package elsewhere directly, then it will be listed by FeatureSummary. Suggested-by: Alex Merry http://thread.gmane.org/gmane.comp.kde.devel.frameworks/10640
* | | | | CMake Nightly Date StampKitware Robot2014-02-051-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'fix-Qt-autogen'Brad King2014-02-049-24/+55
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 6053ce22 QtAutogen: Make uic work even when the source is in a subdir. 1fc9ecfa FindQt4: Make AUTOMOC work regardless which order Qt 4/5 is found.
| * | | | QtAutogen: Make uic work even when the source is in a subdir.Stephen Kelly2014-02-046-22/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify the includedUis to store the path to the file which includes the ui file. Reuse that path to generate the output file from the uic process.
| * | | | FindQt4: Make AUTOMOC work regardless which order Qt 4/5 is found.Stephen Kelly2014-01-293-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 321e348e (QtAutogen: Use Qt 4 IMPORTED targets to find executable locations., 2014-01-24) attempted to fix this problem, but only solved it for a particular ordering of find_package for Qt 4 and Qt 5. Add a test to ensure that it works with both orderings.
* | | | | Merge topic 'osx-rpath-unique'Brad King2014-02-047-11/+94
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | 028a5285 OS X: Make sure RPATHs are unique to avoid possible corruption.
| * | | | OS X: Make sure RPATHs are unique to avoid possible corruption.Clinton Stimpson2014-02-037-11/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using link_directories() and including CMAKE_CFG_INTDIR, one can end up with duplicate RPATHs in the binary which install_name_tool cannot fix without corrupting the binary. Also, the cmake_install.cmake file has been fixed to correctly handle these generator specific variables.
* | | | | CMake Nightly Date StampKitware Robot2014-02-041-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'intro-docs'Brad King2014-02-032-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 395881f7 README: Credit Kitware and community of contributors
| * | | | README: Credit Kitware and community of contributorsBrad King2014-02-032-0/+10
| | | | |
* | | | | Merge topic 'minor-cleanups'Brad King2014-02-032-9/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dcd443d4 cmTarget: Clean up the InsertCompileDefinition implementation.
| * | | | | cmTarget: Clean up the InsertCompileDefinition implementation.Stephen Kelly2014-02-022-9/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | It accepts a before parameter but is never called with before=true. compile definitions are sorted by std::set, so it wouldn't make sense to allow user sorting.
* | | | | Merge topic 'cmake-qt-manual'Brad King2014-02-033-72/+186
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4271a4ed Help: Add information about INTERFACE_AUTOUIC_OPTIONS. 7935f4de Help: Note that AUTOMOC consumes the defines and includes from targets. 2739a6f9 Help: Move Qt tool invocation information to a generic cmake-qt manual.
| * | | | | Help: Add information about INTERFACE_AUTOUIC_OPTIONS.Stephen Kelly2014-02-021-0/+40
| | | | | |
| * | | | | Help: Note that AUTOMOC consumes the defines and includes from targets.Stephen Kelly2014-02-021-0/+4
| | | | | |
| * | | | | Help: Move Qt tool invocation information to a generic cmake-qt manual.Stephen Kelly2014-02-023-72/+142
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an introduction about the use of different package types, and the ability to use Qt 4 and 5 versions together in a single buildsystem. Add a section about automatic linking of the qtmain.lib library and how to disable it.