summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2013-12-061-1/+1
|
* Merge topic 'doc-source_group-FILES'Brad King2013-12-051-14/+30
|\ | | | | | | | | 0060e95 Help: Format and clarify source_group() documentation (#14631)
| * Help: Format and clarify source_group() documentation (#14631)Brad King2013-12-051-14/+30
|/ | | | | Refine the .rst formatting. Document the FILES option explicitly and specify how it treats relative paths.
* Merge topic 'vtk-contract'Brad King2013-12-055-31/+79
|\ | | | | | | | | 1b173f2 Tests/Contracts: Update test for VTK release branch
| * Tests/Contracts: Update test for VTK release branchZack Galbreath2013-12-055-31/+79
| | | | | | | | | | | | The plan is to reinstate the VTK contracts test so that CMake & VTK devs will both be made aware when a change in CMake causes build problems for VTK.
* | Merge topic 'minor-cleanups'Brad King2013-12-054-8/+9
|\ \ | | | | | | | | | | | | | | | | | | 259bf09 Make the cmStrictTargetComparison operate on const cmTarget*. 8cc3cdb Help: Fix up the VISIBILITY_INLINES_HIDDEN docs. 1396ab8 Don't generate self-references for system include directories.
| * | Make the cmStrictTargetComparison operate on const cmTarget*.Stephen Kelly2013-12-042-2/+3
| | |
| * | Help: Fix up the VISIBILITY_INLINES_HIDDEN docs.Stephen Kelly2013-12-031-5/+5
| | | | | | | | | | | | | | | Resolve some sentence fragments, remove a copy-pasto from other docs and use a link to the CMAKE_VISIBILITY_INLINES_HIDDEN variable.
| * | Don't generate self-references for system include directories.Stephen Kelly2013-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | Targets which link directly to themselves should not result in generate-time errors (reported by the DAG checker). Self-links are handled separately with policy CMP0038.
* | | Merge topic 'cleanup-build-commands'Brad King2013-12-0512-14/+97
|\ \ \ | | | | | | | | | | | | | | | | | | | | e420124 CMakeDetermineCompilerId: Use CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND 0c55729 VS: Add CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND variables
| * | | CMakeDetermineCompilerId: Use CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMANDBrad King2013-12-041-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the code path for launching the VS IDE tools, avoid using CMAKE_MAKE_PROGRAM. Instead use the variables CMAKE_VS_DEVENV_COMMAND, CMAKE_VS_MSBUILD_COMMAND, and CMAKE_VS_MSDEV_COMMAND to lookup the location of the build tool needed. Choose the proper tool based on availability and necessity for the language (e.g. Intel Fortran must build with devenv.com and not MSBuild.exe).
| * | | VS: Add CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND variablesBrad King2013-12-0411-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 5f5c92b9 (VS: Add internal APIs to find MSBuild, devenv/VCExpress, and msdev, 2013-11-13) the VS generators have known how to lookup the locations of their build tools directly. Expose this information to CMake language code by defining new variables to hold the paths to these tools.
* | | | CMake Nightly Date StampKitware Robot2013-12-051-1/+1
| | | |
* | | | Merge topic 'fix-export-segfault'Brad King2013-12-047-0/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 1cd1430 export(): Check targets exist at configure-time (#14608)
| * | | | export(): Check targets exist at configure-time (#14608)Stephen Kelly2013-12-047-0/+21
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 66b290e7 (export(): Process the export() command at generate time., 2012-10-06 ) refactored export() so that it could evaluate strings at generate-time. This was intended for evaluating target properties, but that commit also removed a check for target existence at configure-time. Restore that check and add a test for this case.
* | | | CMake Nightly Date StampKitware Robot2013-12-041-1/+1
| | | |
* | | | Merge topic 'filter-showincludes-in-launcher'Brad King2013-12-035-4/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e5e3f3d CTest: filter /showIncludes output from ninja compile launcher
| * | | | CTest: filter /showIncludes output from ninja compile launcherNils Gladitz2013-12-035-4/+46
| | | | | | | | | | | | | | | | | | | | | | | | | Teach "ctest --launch" a new "--filter-prefix" option. Set it using the CMAKE_CL_SHOWINCLUDES_PREFIX value with the Ninja generator.
* | | | | Merge topic 'cmake-toolchains-manual'Brad King2013-12-0319-14/+230
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c45b5ce Help: Add cmake-toolchains.7 manual 3e3f8b4 Help: Document the CMAKE_FIND_ROOT_PATH* variables. 531c108 Help: Document the CMAKE_TOOLCHAIN_FILE.
| * | | | | Help: Add cmake-toolchains.7 manualStephen Kelly2013-12-032-0/+161
| | | | | | | | | | | | | | | | | | | | | | | | Create a manual for toolchain related docs.
| * | | | | Help: Document the CMAKE_FIND_ROOT_PATH* variables.Stephen Kelly2013-11-2713-11/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a replacement template for the variables, and link to them from the documentation for the find_* commands.
| * | | | | Help: Document the CMAKE_TOOLCHAIN_FILE.Stephen Kelly2013-11-275-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | Link to the new docs from existing references to the variable.
* | | | | | Merge topic 'Haiku-CPU-count'Brad King2013-12-031-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | eef42a0 ProcessorCount: make it work on Haiku
| * | | | | | ProcessorCount: make it work on HaikuRolf Eike Beer2013-12-021-0/+14
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'lang-flag-var-helpstrings'Brad King2013-12-033-12/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d2452d Fix CMAKE_(C|CXX|Fortran)_STANDARD_LIBRARIES helpstrings (#14622) 2b77b53 Make CMAKE_(C|CXX|Fortran)_<CONFIG> help strings more consistent (#14606) 424c6fc Fix CMAKE_(C|CXX|Fortran)_RELEASE helpstrings (#14606)
| * | | | | | Fix CMAKE_(C|CXX|Fortran)_STANDARD_LIBRARIES helpstrings (#14622)Brad King2013-12-033-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | s/defalut/default/ Reported-by: Stephan Tolksdorf <st@quanttec.com>
| * | | | | | Make CMAKE_(C|CXX|Fortran)_<CONFIG> help strings more consistent (#14606)Brad King2013-12-023-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use consistent capitalization and write all words out in the cache entry descriptions.
| * | | | | | Fix CMAKE_(C|CXX|Fortran)_RELEASE helpstrings (#14606)Brad King2013-12-023-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the platform-specific description from the cache entry help strings for these variables.
* | | | | | | Merge topic 'cmake-mt-return-value'Brad King2013-12-031-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d384b5a cmake: Fix mt return value when hosted on posix (#14605)
| * | | | | | | cmake: Fix mt return value when hosted on posix (#14605)Flynn Marquardt2013-12-021-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On posix platforms return values are limited to a range from 0 to 255. Cross compiling/linking with MSVC on linux/wine leads to a misinterpretation of the return value 1090650113 of mt.exe.
* | | | | | | Merge topic 'osx-cross-compile-fixup'Brad King2013-12-031-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3189ed3 OS X: Fix app bundle search path during cross compiling (#14603)
| * | | | | | | OS X: Fix app bundle search path during cross compiling (#14603)Flynn Marquardt2013-12-021-1/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In "Modules/Platform/Darwin.cmake" the variable _apps_paths stays empty if cross compiling. Do not de-duplicate an empty list.
* | | | | | | Merge topic 'xcode-folder-dedup'Brad King2013-12-031-7/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2dcb1dc Xcode: Fix duplicate target subfolders (#14133)
| * | | | | | | Xcode: Fix duplicate target subfolders (#14133)Stephan Tolksdorf2013-12-021-7/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic introduced by commit eeeeca10 (XCode: Support target folders on XCode, 2011-02-20) to avoid duplicate subfolders. The problem was that no slash was appended to the curr_tgt_folder string on the it != this->TargetGroup.end() path.
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-031-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'doc-pdb-not-for-static-libs'Brad King2013-12-028-22/+54
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c0897cf Help: Document PDB behavior w.r.t. static libraries explicitly (#14600) 09c05f3 Help: Format PDB_NAME and PDB_OUTPUT_DIRECTORY documentation cb7b907 Help: Document CMAKE_PDB_OUTPUT_DIRECTORY_<CONFIG> variable
| * | | | | | Help: Document PDB behavior w.r.t. static libraries explicitly (#14600)Brad King2013-12-027-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document PDB_NAME and PDB_OUTPUT_DIRECTORY as applying only to shared libraries and executables. Add an explicit note to explain why they do not work for static libraries.
| * | | | | | Help: Format PDB_NAME and PDB_OUTPUT_DIRECTORY documentationBrad King2013-12-025-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add reStructuredText inline markup.
| * | | | | | Help: Document CMAKE_PDB_OUTPUT_DIRECTORY_<CONFIG> variableBrad King2013-12-022-0/+11
| | |_|_|/ / | |/| | | |
* | | | | | Merge topic 'use-generator-target'Brad King2013-12-021-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 02a545c Don't generate subdir convenience rules for IMPORTED targets.
| * | | | | | Don't generate subdir convenience rules for IMPORTED targets.Stephen Kelly2013-11-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missing from commit c34968a9 (Port some of the generator API to cmGeneratorTarget., 2012-10-10). The generator targets stored with the cmMakefile include IMPORTED targets, unlike the accessor for resgular targets. Before this patch, rules would be generated for Qt5::Core for example, which result in broken makefiles.
* | | | | | | Merge topic 'INTERFACE_AUTOUIC_OPTIONS'Brad King2013-12-0227-15/+655
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98093c4 QtAutoUic: Add INTERFACE_AUTOUIC_OPTIONS target property. 02542b4 QtAutoUic: Handle new -include command line parameter. 1242f4e Genex: Add {UPPER,LOWER}_CASE and MAKE_C_IDENTIFIER. 754b321 QtAutogen: Use config without prefix in map key.
| * | | | | | | QtAutoUic: Add INTERFACE_AUTOUIC_OPTIONS target property.Stephen Kelly2013-11-2723-13/+592
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transitively consume the property from linked dependents. Implement configuration-specific support by following the pattern set out for compile definitions and includes in cmQtAutoGenerators. Implement support for origin-tracking with CMAKE_DEBUG_TARGET_PROPERTIES. This is motivated by the needs of KDE, which provides a separate translation system based on gettext instead of the Qt linguist translation system. The Qt uic tool provides command line options for configuring the method used to translate text, and to add an include directive to the generated file to provide the method. http://thread.gmane.org/gmane.comp.kde.devel.frameworks/7930/focus=7992 Implement the interface to provide the uic options as a usage-requirement on the KI18n target, as designed for KDE.
| * | | | | | | QtAutoUic: Handle new -include command line parameter.Stephen Kelly2013-11-271-0/+1
| | | | | | | |
| * | | | | | | Genex: Add {UPPER,LOWER}_CASE and MAKE_C_IDENTIFIER.Stephen Kelly2013-11-274-0/+60
| | | | | | | |
| * | | | | | | QtAutogen: Use config without prefix in map key.Stephen Kelly2013-11-271-2/+2
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This is used by IDE generators to select config-specific includes and defines.
* | | | | | | Merge topic 'wix-components'Brad King2013-12-027-48/+325
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b390f7 CPackWiX: add CPack component support
| * | | | | | | CPackWiX: add CPack component supportNils Gladitz2013-11-267-48/+325
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a hierarchy of WiX features from CPack components and component groups. Switch to the FeatureTree UI in case components have been defined. Handles the component REQUIRE and HIDDEN options and the component group EXPANDED option.
* | | | | | | | Merge topic 'FindSWIG-3498'Brad King2013-12-021-2/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d3b0bb FindSWIG: allow to provide SWIG_DIR (#3498)
| * | | | | | | | FindSWIG: allow to provide SWIG_DIR (#3498)Julien Schueller2013-12-011-2/+0
| | | | | | | | |