summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'INTERFACE-error-with-linked-genex'Brad King2013-10-1818-7/+161
|\ | | | | | | | | 70ae6df Handle genexes when evaluating INTERFACE_INCLUDE_DIRECTORIES errors.
| * Handle genexes when evaluating INTERFACE_INCLUDE_DIRECTORIES errors.Stephen Kelly2013-10-1818-7/+161
|/
* Merge topic 'help-replace-version'Brad King2013-10-181-0/+2
|\ | | | | | | | | 89448a5 cmRST: Substitute CMake version for |release| as Sphinx does
| * cmRST: Substitute CMake version for |release| as Sphinx doesBrad King2013-10-171-0/+2
| | | | | | | | | | Sphinx provides a builtin substitution for the |release| version. Teach cmRST to replace this with the CMake version number too.
* | Merge topic 'fix-policy-versions'Brad King2013-10-184-8/+8
|\ \ | | | | | | | | | | | | 1873205 Update CMP0024/CMP0025/CMP0026 release version
| * | Update CMP0024/CMP0025/CMP0026 release versionBrad King2013-10-174-8/+8
| | | | | | | | | | | | | | | | | | These policies were introduced after 2.8.12 in anticipation of 2.8.13. However, we've now decided the next release will be 3.0.0, so update the version of introduction accordingly.
* | | Merge topic 'doc-drop-policy-builtin'Brad King2013-10-182-427/+1
|\ \ \ | |/ / | | | | | | | | | 5cdaef7 Drop builtin policy "full" documentation
| * | Drop builtin policy "full" documentationBrad King2013-10-172-427/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | The full policy documentation was moved to Help/policy/*.rst by commit f051814e (Convert builtin help to reStructuredText source files, 2013-10-15). We no longer need the builtin string literals. In commit 87cc62ca (Drop "full" documentation output types, 2013-09-13) we dropped code using the LongDescription field of policy definitions. We need to follow it up with a change similar to commit 399e9c46 (Drop builtin property documentation, 2013-09-16) to remove the policy documentation. Do that now. Keep the short description as it is used in policy error and warning messages.
* | Merge topic 'allow-repeated-LINK-keywords'Brad King2013-10-182-5/+7
|\ \ | | | | | | | | | | | | dede273 target_link_libraries: Allow repeated use of LINK_{PRIVATE,PUBLIC} keywords.
| * | target_link_libraries: Allow repeated use of LINK_{PRIVATE,PUBLIC} keywords.Stephen Kelly2013-10-172-5/+7
| |/ | | | | | | | | | | | | This has not been allowed since they were introduced in commit 91438222 (target_link_libraries: Add LINK_(PUBLIC|PRIVATE) options, 2011-10-07), but allowing this form makes it more compatible with the newer PUBLIC and PRIVATE keywords.
* | Merge topic 'simplify-cmake-E-command-line'Brad King2013-10-181-25/+31
|\ \ | | | | | | | | | | | | d4c3de2 cmake: Simplify -E command line processing
| * | cmake: Simplify -E command line processingBrad King2013-10-171-25/+31
| |/ | | | | | | | | | | | | | | | | | | Check for "cmake -E ..." up front (along with "cmake --build ...") and skip normal command line processing. Drop the special handling for -E from the normal processing to simplify things. Strictly speaking, it was previously possible to invoke command mode with -E anywhere in the command line e.g. "cmake echo -E message" or "cmake echo message -E", but no one should be using it as it was not documented and looks strange.
* | Merge topic 'vs-intel-compiler'Brad King2013-10-1816-129/+161
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | d14898b Intel: Fix detection of MSVC version simulated by pre-11.0 Fortran a85e17e Intel: When simulating MSVC, re-use Windows-MSVC (#14476) af40e8c VS: Detect Intel Fortran compiler id and version b8522a8 VS: Expose Intel Fortran .vfproj format version to CMake language 2d36c9a CMakeDetermineCompilerId: Fix Intel Fortran compiler id detection a6fd17c VS: Fix CMAKE_<LANG>_COMPILER detection with Intel toolset (#14471)
| * | Intel: Fix detection of MSVC version simulated by pre-11.0 FortranBrad King2013-10-181-3/+1
| | | | | | | | | | | | | | | | | | | | | The Intel Fortran 10 64-bit compiler incorrectly defines _MSC_VER to its own version (1020) instead of the underlying MSVC tools version. Since we expect the compiler to be used only with VS >= 7 tools, assume MSVC version 13.0 if _MSC_VER is not greater than 1300.
| * | Intel: When simulating MSVC, re-use Windows-MSVC (#14476)Brad King2013-10-188-93/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | Teach CMake(C|CXX|Fortran)CompilerId* to report the MSVC version simulated by the Intel compiler, if any. Refactor the Windows-Intel platform information helper module to load Windows-MSVC instead of duplicating the information. Teach Windows-MSVC to understand when it is loaded as the simulated Fortran compiler (its preprocessor is simulated).
| * | VS: Detect Intel Fortran compiler id and versionBrad King2013-10-184-6/+47
| | | | | | | | | | | | | | | | | | Teach CMakeDetermineCompilerId to use a .vfproj project file to build the Fortran compiler id source file under the Visual Studio generators.
| * | VS: Expose Intel Fortran .vfproj format version to CMake languageBrad King2013-10-185-29/+58
| | | | | | | | | | | | | | | | | | Lookup the Intel VS plugin version on demand in the VS global generator, compute the corresponding .vfproj format version number, and memoize it. Add it as a CMAKE_VS_INTEL_Fortran_PROJECT_VERSION platform definition.
| * | CMakeDetermineCompilerId: Fix Intel Fortran compiler id detectionBrad King2013-10-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Intel Fortran compiler needs the /fpp option to enable C preprocessing. Without the option the compiler may warn and ignore preprocessor lines instead of failing with an error. Detect the warning and treat it as failure so that we move on to try /fpp and detect the correct id. Without this it works only by luck because Intel is the first compiler id in our detection source file.
| * | VS: Fix CMAKE_<LANG>_COMPILER detection with Intel toolset (#14471)Brad King2013-10-161-0/+3
| | | | | | | | | | | | | | | When the platform toolset is from Intel, look for "icl.exe" instead of "cl.exe".
* | | Merge topic 'coverity-generated-tests'Brad King2013-10-181-0/+7
|\ \ \ | | | | | | | | | | | | | | | | 7eddefd TestDriver.cxx.in: Untrusted array index read.
| * | | TestDriver.cxx.in: Untrusted array index read.Matt McCormick2013-10-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported by Coverity Scan, if the configured file contains a #include, Untrusted array index read The array index could be controlled by an attacker, leading to reads outside the bounds of the array. In main: Read from array at index computed using an unscrutinized value from an untrusted source (CWE-129) CID 1081283 (#1 of 1): Untrusted array index read (TAINTED_SCALAR) 25. tainted_data: Using tainted variable "testToRun" as an index into an array "cmakeGeneratedFunctionMapEntries".
* | | | CMake Nightly Date StampKitware Robot2013-10-181-1/+1
| |_|/ |/| |
* | | Merge topic 'help-manual-cleanup'Brad King2013-10-1715-870/+283
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b212ad Make --help-* options available from all command-line tools 5dde65a Help: De-duplicate manual/(cmake|ccmake).1.rst build options ae944d1 Help: Organize manual/*.1.rst sections 4f7d708 Help: Drop leftover conversion content from manual/*.1.rst
| * | | Make --help-* options available from all command-line toolsBrad King2013-10-1613-370/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the standard --help-* options available from all command-line tools. Drop options that are no longer supported: --copyright, --help-full, --help-html, --help-man, --help-compatcommands, --help-custom-modules De-duplicate Help/manual/*.1.rst help options by using an OPTIONS_HELP.txt file included from each manual.
| * | | Help: De-duplicate manual/(cmake|ccmake).1.rst build optionsBrad King2013-10-163-115/+59
| | | | | | | | | | | | | | | | | | | | Move common build options out of cmake and ccmake manuals into an OPTIONS_BUILD.txt file and include it from the original locations.
| * | | Help: Organize manual/*.1.rst sectionsBrad King2013-10-166-116/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "Synopsis", "Description", and "See Also" manual page section headers. These are typical of .1 man section pages. Also de-duplicate the See Also section links using a separate LINKS.txt file included from each manual.
| * | | Help: Drop leftover conversion content from manual/*.1.rstBrad King2013-10-165-269/+0
| | | | | | | | | | | | | | | | | | | | Some text in these manuals is left from the old full help transition text generated by the automatic conversion process. Drop it.
* | | | Merge topic 'wix-documentation-escapes'Brad King2013-10-171-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 42b4f6c CPackWiX: prevent attribute references in docs from being interpreted
| * | | | CPackWiX: prevent attribute references in docs from being interpretedNils Gladitz2013-10-161-2/+2
| |/ / /
* | | | Merge topic 'readable-lupdate.pro'Brad King2013-10-171-3/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 51305f5 Qt4: make pro files generated for translations easier to read
| * | | | Qt4: make pro files generated for translations easier to readRolf Eike Beer2013-10-161-3/+4
| |/ / / | | | | | | | | | | | | | | | | -use one line for each input file and include directory -remove duplicate include directories
* | | | Merge topic 'print-CMP0022-content-conflict-test'Brad King2013-10-174-0/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4fd6024 CMP0022: Add unit test for null pointer check and message.
| * | | | CMP0022: Add unit test for null pointer check and message.Stephen Kelly2013-10-164-0/+29
| |/ / /
* | | | CMake Nightly Date StampKitware Robot2013-10-171-1/+1
|/ / /
* | | Merge topic 'update-kwsys'Brad King2013-10-161-0/+9
|\ \ \ | |_|/ |/| | | | | | | | | | | 0408415 Merge branch 'upstream-kwsys' into update-kwsys c01e744 KWSys 2013-10-15 (6eab64c3)
| * | Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-10-151-0/+9
| |\ \
| | * | KWSys 2013-10-15 (6eab64c3)KWSys Robot2013-10-151-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 6eab64c3 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 96b2f6f4..6eab64c3 Raphael Kubo da Costa (1): 6eab64c3 SystemInformation: Include backtrace-related headers on FreeBSD Change-Id: Ib0447aab3d6555ce278f0c1417af2c53e6f181a5
* | | | Merge topic 'doc-reStructuredText'Brad King2013-10-161352-36097/+24015
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7038a93 Modules/readme.txt: Update steps to add module documentation a77e308 CPack: Replace #<type> markup with reStructuredText equivalent e7ca48f Help: Factor out cmake-generator-expressions manual page 97e8650 Help: Factor out COMPILE_DEFINITIONS disclaimer duplication 8982161 Help: Factor out find_* command duplication 30b2186 Help: Factor out *_OUTPUT_(NAME|DIRECTORY).rst duplication bfe07aa Build Help documentation during CMake build using Sphinx 53ded59 Drop unused builtin documentation APIs 0c39a75 Drop the 'Full' field from cmDocumentationEntry e33d8d2 Drop builtin command documentation 399e9c4 Drop builtin property documentation 6035c04 get_property: Drop test for builtin property documentation 80a3273 Drop all documentation formatters except Usage b336a1eb Teach COMPATIBLE_INTERFACE_* checks to use Help .rst documents ec6df36 Teach --help-* options to load documentation from .rst files 25f2877 Add class cmRST to do basic reStructuredText processing ...
| * | | | Modules/readme.txt: Update steps to add module documentationBrad King2013-10-161-23/+41
| | | | | | | | | | | | | | | | | | | | | | | | | Replace the old module documentation instructions with steps to add reStructuredText documentation that will be built by Sphinx.
| * | | | CPack: Replace #<type> markup with reStructuredText equivalentKitware Robot2013-10-1611-1188/+805
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop #end and #module. Convert #section to a subsection header. Convert #variable to the cmake domain "variable" directive. Convert #macro to the cmake domain "command" directive. Perform minor formatting fixes in text near these changes.
| * | | | Help: Factor out cmake-generator-expressions manual pageBrad King2013-10-1620-1219/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generator expressions are supported in many places and are a distinct concept worthy of their own manual page. The old builtin documentation was previously represented by preprocessor macros to generate it into each place that supports them. Factor out the duplicate content into a dedicated cmake-generator-expressions manual page and reference it from each original location.
| * | | | Help: Factor out COMPILE_DEFINITIONS disclaimer duplicationBrad King2013-10-164-60/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The COMPILE_DEFINITIONS escaping disclaimer was represented in builtin documentation using a preprocessor macro. Factor the duplicate content out into a separate .txt file and include it in each document with the reStructuredText include directive.
| * | | | Help: Factor out find_* command duplicationBrad King2013-10-169-628/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These documents were represented in the builtin documentation using a common starting point with placeholders substituted by each command. Convert them back to this approach using the reStructuredText include directive and substitutions to avoid duplication.
| * | | | Help: Factor out *_OUTPUT_(NAME|DIRECTORY).rst duplicationBrad King2013-10-169-81/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Portions of these documents contain duplicate content generated from preprocessor macros in the original builtin documentation source. Factor the common parts out into .txt files using reStructuredText include directives and substitutions to avoid duplication.
| * | | | Build Help documentation during CMake build using SphinxBrad King2013-10-167-0/+471
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a Utilities/Sphinx directory to hold CMake build code to run the Sphinx (sphinx-doc.org) documentation generation tool. Create a CMakeLists.txt file there capable of building either as a subdirectory of the main CMake build, or as a standalone documentation build. Add cache options SPHINX_MAN and SPHINX_HTML to select output formats and SPHINX_EXECUTABLE to specify the sphinx-build executable. Add bootstrap options --sphix-man and --sphinx-html to select output formats and --sphinx-build=<sb> to specify the sphinx-build executable. Create a "conf.py.in" file to configure_file into "conf.py" to tell sphinx-build how to build our documents. Create a "cmake.py" Sphinx extension module defining: * The "cmake-module" directive used in Help/module/*.rst files to scan .rst markup from the corresponding Modules/*.cmake file. * A Sphinx domain called "cmake" defining documentation object types for CMake Help/<type> directories: command, generator, manual, module, policy, prop_*, and variable. Add a "role" for each type to perform cross-references. Teach the roles to treat "<XYZ>" as placeholders instead of explicit targets if not preceded by a space. Add cmake domain directives to define command and variable objects explicitly in .rst file content. This will allow modules to define their own commands and variables and have them indexed and linkable. * A Sphinx document transform that converts Help/<type>/*.rst documents into cmake domain objects of the corresponding <type> and adds index entries for them. This will automatically index all CMake documentation objects and provide cross-reference targets for them with no special markup in the .rst files.
| * | | | Drop unused builtin documentation APIsBrad King2013-10-166-29/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Now that all DefineProperty documentation calls have been dropped, drop the supporting APIs.
| * | | | Drop the 'Full' field from cmDocumentationEntryBrad King2013-10-1633-663/+187
| | | | | | | | | | | | | | | | | | | | | | | | | We need only 'Brief' for usage documentation. We no longer have builtin 'Full' documentation, which is now in Help/*/*.rst files.
| * | | | Drop builtin command documentationBrad King2013-10-16131-5529/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Drop all GetTerseDocumentation and GetFullDocumentation methods from commands. The command documentation is now in Help/command/*.rst files.
| * | | | Drop builtin property documentationBrad King2013-10-1619-4447/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop all DefineProperty calls for non-chained properties. Drop the documentation from the chained ones. The documentation for all properties is now in Help/prop_*/*.rst files.
| * | | | get_property: Drop test for builtin property documentationBrad King2013-10-161-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Property documentation is no longer builtin, so the get_property command will be unable to return the documentation. Drop the test for it.