summaryrefslogtreecommitdiffstats
path: root/Help
Commit message (Collapse)AuthorAgeFilesLines
* CPackWIX: Enabled patching of WIX <Feature> tagsMichael Stürmer2016-09-091-0/+5
|
* Merge topic 'vs-15-generator'Brad King2016-09-084-1/+22
|\ | | | | | | | | | | | | bdc679a8 VS15: Add Visual Studio 15 generator a8936656 VS: Update v140 flag tables from VS 15 MSBuild files 21346d3f Features: Record features for VS 15 Preview 4
| * VS15: Add Visual Studio 15 generatorBrad King2016-09-074-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call the generator "Visual Studio 15" without any year because the preview version of VS 15 does not provide a year in the product name. Copy cmGlobalVisualStudio14Generator to cmGlobalVisualStudio15Generator and update version numbers accordingly. Add the VS15 enumeration value. Note that we do not need to add a MSVC15 variable or v150 toolset because Visual Studio 15 comes with an updated version of the v140 toolset and remains ABI-compatible. Teach tests VSExternalInclude, RunCMake.GeneratorPlatform, and RunCMake.GeneratorToolset to treat VS 15 as they do VS 10-14. Closes: #16143
* | Merge topic 'GNUInstallDirs-function'Brad King2016-09-071-0/+5
|\ \ | | | | | | | | | | | | 17a24dc3 GNUInstallDirs: Add macro to expose internal logic publicly
| * | GNUInstallDirs: Add macro to expose internal logic publiclyRoger Leigh2016-09-071-0/+5
| | |
* | | Merge topic 'cpack-deb-package-description-fallback'Brad King2016-09-071-0/+15
|\ \ \ | |_|/ |/| | | | | | | | 332b089a CPack/DEB: Make package description variable precedence match RPM
| * | CPack/DEB: Make package description variable precedence match RPMDomen Vrankar2016-09-071-0/+15
| |/ | | | | | | | | | | | | | | | | Make `CPACK_DEBIAN_PACKAGE_DESCRIPTION` fallback variable precedence match CPackRPM behavior as much as possible. This is technically a breaking change, but the new behavior is more consistent with expectation anyway. Closes: #16272
* | Help: Clarify meaning of MSVC<NN> variablesBrad King2016-09-066-18/+12
|/ | | | They correspond to toolsets, not VS IDE versions.
* CPack/DEB: Add option to select archive typeDomen Vrankar2016-09-051-0/+6
| | | | | | | Add a `CPACK_DEBIAN_ARCHIVE_TYPE` option that can be used to select an archive type that supports long file names. Closes: #14332
* Merge topic 'doc-XCODE-variable'Brad King2016-08-312-0/+5
|\ | | | | | | | | 3e8615ef Document XCODE variable
| * Document XCODE variableRuslan Baratov2016-08-312-0/+5
| |
* | Utilities/Release: Drop Linux 32-bit binaryBrad King2016-08-301-0/+5
|/ | | | | | | The Linux distro we've been using for this is so old that it limits our ability to import newer third-party software. Until a new machine can be configured to provide this binary we can simply drop it. Users will still be able to build from source or use a distro-provided version.
* Merge topic 'ninja-add_custom_command-depfile'Brad King2016-08-302-0/+13
|\ | | | | | | | | 048d1adb add_custom_command: Add DEPFILE option for Ninja
| * add_custom_command: Add DEPFILE option for NinjaKulla Christoph2016-08-302-0/+13
| | | | | | | | | | | | | | | | Provide a way for custom commands to inform the ninja build tool about their implicit dependencies. For now simply make use of the option an error on other generators. Closes: #15479
* | CPack/RPM: Add test for debuginfo package generationDomen Vrankar2016-08-261-0/+6
|/
* Merge topic 'android-platform-modules'Brad King2016-08-2419-27/+381
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b637ebd Android: Add `ANDROID` variable to indicate the target c2f561e5 Android: Add test cases covering use of the NDK and standalone toolchains 6b84df8d Help: Document cross compiling for Android d7d40830 Android: Select the STL type for NDK builds b22294bc Android: Populate compiler flags for current ABI b6a3102a Android: Add a CMAKE_BUILD_TYPE default d1e3cec2 Android: Add Clang -target option for current ABI 504db72d Android: Add placeholders for compiler/abi-specific settings fa632578 Android: Avoid interfering with common pre-existing toolchain files 6299693f Android: Search for NDK and standalone toolchain in more places 29b51379 Android: Detect and save a standalone toolchain without the NDK 7d9b49fb Android: Detect settings from the CMAKE_SYSROOT if it is set 4389664a Android: Detect and save a toolchain from the NDK 328191f6 Android: Set CMAKE_SYSROOT automatically 9e032304 Android: Detect and save the architecture, ABI, and processor fde59c4d Android: Detect and save the API level ...
| * Android: Add `ANDROID` variable to indicate the targetBrad King2016-08-232-0/+6
| | | | | | | | | | Allow projects to use `if(ANDROID)` to condition their Android-specific code paths.
| * Help: Document cross compiling for AndroidBrad King2016-08-2318-27/+375
| | | | | | | | | | | | CMake now supports cross compiling for Android using the NDK or a standalone toolchain. Document the associated variables and how how to write toolchain files for Android.
* | Merge topic 'extend-find-package-search-path'Brad King2016-08-241-7/+10
|\ \ | | | | | | | | | | | | | | | 828d6c13 find_package: Extend search path for combined Windows/UNIX convention ff5c89de Help: Widen find_package search path table
| * | find_package: Extend search path for combined Windows/UNIX conventionSilvio Traversaro2016-08-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Find packages that install their cmake package configuration files in `lib/cmake/<name>` when they are installed in the default Windows CMAKE_INSTALL_PREFIX, `C:/Program Files/<name>`. Closes: #16212
| * | Help: Widen find_package search path tableSilvio Traversaro2016-08-231-7/+7
| | | | | | | | | | | | Make room for additional longer entries.
* | | Merge topic 'doc-get_cmake_property'Brad King2016-08-241-3/+8
|\ \ \ | | | | | | | | | | | | | | | | 15cc50fb Help: Clarify get_cmake_property command documentation
| * | | Help: Clarify get_cmake_property command documentationBrad King2016-08-231-3/+8
| |/ / | | | | | | | | | Closes: #13810, #16258
* | | Merge topic 'import-vim-syntax'Brad King2016-08-241-0/+11
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | b4556b47 Help: Add release notes for 'vim-cmake-syntax' import 25c01cf0 Aux: Install vim-cmake-syntax files with CMake e3ac68cf Merge branch 'upstream-vim-cmake-syntax' into import-vim-syntax 4a22c06e vim-cmake-syntax 2016-08-16 (e782679c) f21a8235 Aux: Drop vim files prior to import of third-party version 0966f1c5 Add script to update vim-cmake-syntax from upstream
| * | Help: Add release notes for 'vim-cmake-syntax' importBrad King2016-08-171-0/+11
| | |
* | | cmake: Add `cmake -E capabilities` modeTobias Hunger2016-08-162-0/+43
|/ / | | | | | | | | | | | | Add `cmake -E capabilities` to report on generators, cmake version and possibly other static capabilities of cmake. Closes: #15462
* | Merge topic 'autogen-same-name'Brad King2016-08-151-0/+5
|\ \ | |/ |/| | | | | | | | | | | | | | | 61a607e8 Help: Document AUTORCC behavior for same .qrc name case e4f508e4 Tests/QtAutogen: Test same moc/qrc source names in different directories 4e9b97d7 QtAutogen: Allow multiple qrc files with the same name 41c9e14a QtAutogen: Allow multiple moc files with the same name 3c3b37b0 QtAutogen: Use std:: instead of ::std:: 0a5dd3c7 cmFilePathUuid: Add class to generate deterministic unique file names
| * Help: Document AUTORCC behavior for same .qrc name caseSebastian Holtermann2016-08-151-0/+5
| |
* | Merge topic 'ninja-directory-targets'Brad King2016-08-102-3/+22
|\ \ | | | | | | | | | | | | | | | 02789894 Ninja: Add `$subdir/{test,install,package}` targets a88c99f1 Ninja: Simplify computation of GLOBAL_TARGET outputs
| * | Ninja: Add `$subdir/{test,install,package}` targetsBrad King2016-08-092-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the Makefile generator one can use `cd $subdir; make install` to build and install targets associated with a given subdirectory. This is not possible to do with the Ninja generator since there is only one `build.ninja` file at the top of the build tree. However, we can approximate it by allowing one to run `ninja $subdir/install` at the top of the tree to build the targets in the corresponding subdirectory and install them. This also makes sense for `test`, `package`, and other GLOBAL_TARGET targets. It was already done for `all` by commit v3.6.0-rc1~240^2~2 (Ninja: Add `$subdir/all` targets, 2016-03-11).
* | | Merge topic 'add-extra-boolean-comparisons'Brad King2016-08-105-25/+64
|\ \ \ | |/ / |/| | | | | | | | 02d177c9 Add additional <= and >= comparison operators
| * | Add additional <= and >= comparison operatorsChuck Atkins2016-08-095-25/+64
| |/ | | | | | | | | This adds the LESS_EQUAL, GREATER_EQUAL, and associated STR and VERSION equivalents to use the combined <= and >= functionality.
* | CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER featureMichael Stürmer2016-08-081-0/+7
|/ | | | | The new variable allows setting of a custom absolute installation prefix outside of the ProgramFiles folders.
* Merge topic 'ccmake-vim-navigation'Brad King2016-08-031-0/+4
|\ | | | | | | | | | | | | e34e9c27 ccmake: Add VIM-like bindings for navigation 9a1b6c60 ccmake: Revise documentation for [d] 31b6cf41 ccmake: Fix typo in help (it's -> its)
| * ccmake: Add VIM-like bindings for navigationPaul Seyfert2016-08-021-0/+4
| | | | | | | | | | | | * scroll with j/k * toggle bool with space, enter insert mode with i * bindings not shown at the bottom of the screen, but given in help
* | Merge topic 'wix-root-description'Brad King2016-08-031-0/+7
|\ \ | |/ |/| | | | | e29bfbf2 CPackWIX: Support custom title and description for the root feature
| * CPackWIX: Support custom title and description for the root featureMichael Stürmer2016-08-021-0/+7
| | | | | | | | | | | | These can now be specified through the WIX generator specific CPack variables CPACK_WIX_ROOT_FEATURE_TITLE and CPACK_WIX_ROOT_FEATURE_DESCRIPTION.
* | Help: Fix CMAKE_INSTALL_PREFIX documented default on WindowsBrad King2016-08-011-1/+1
|/ | | | Fixes #16211.
* Merge topic 'wix-disabled-components'Brad King2016-08-011-0/+6
|\ | | | | | | | | | | ad453f05 CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLED 6f108f84 CPackComponent: Document the *_HIDDEN and *_DISABLED variables
| * CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLEDMichael Stürmer2016-07-221-0/+6
| | | | | | | | Reviewed-by: Nils Gladitz <nilsgladitz@gmail.com>
* | Merge topic 'app-framework-bundle-extension'Brad King2016-08-012-3/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | f951d0ad Add tests for BUNDLE_EXTENSION c63380b1 Update documentation about bundle extensions 134d5c1f Honor BUNDLE_EXTENSION also for Frameworks (#14742) 2b909c08 Honor BUNDLE_EXTENSION also for App Bundles (#16148)
| * | Update documentation about bundle extensionsGregor Jasny2016-07-222-3/+9
| |/
* | Merge topic 'nsis-protect-uninst-exec'Brad King2016-07-221-0/+6
|\ \ | |/ |/| | | | | 11768733 NSIS: Quote uninstaller path when executing it in a shell
| * NSIS: Quote uninstaller path when executing it in a shellJustin Clift2016-07-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Protect our `$0` reference in the shell as `"$0"`. Otherwise it works with a space in the path only due to an insecure Windows feature. Prior to this fix, any installer using the option added by commit v2.8.9~234^2 (Added CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL, 2011-06-11) exposes a local privilege escalation vulnerability. Reported-by: Amir Szekely <kichik@gmail.com> Reported-by: Ug_0 Security
* | Help: Add notes for topic 'FindBISON-report-file'Brad King2016-07-181-0/+5
| |
* | VS: Add support for NATVIS filesRobert Dailey2016-07-151-0/+5
| | | | | | | | | | | | | | | | Add an explicit `<Natvis>` element in VS project files for `*.natvis` files. These enable custom debug visualizers for project-specific types. Fixes #16043.
* | Merge topic 'toolchain-flag-init'Brad King2016-07-1510-0/+101
|\ \ | | | | | | | | | | | | | | | | | | | | | 8a98cf64 Honor CMAKE_*_LINKER_FLAGS[_<CONFIG>]_INIT set in toolchain files 37d15c39 MSVC: Set all CMAKE_*_LINKER_FLAGS_INIT directly 55c884ed Embarcadero: Set all CMAKE_*_LINKER_FLAGS_INIT directly aec3c79a Strip CMAKE_*_LINKER_FLAGS[_<CONFIG>] initializer whitespace
| * | Honor CMAKE_*_LINKER_FLAGS[_<CONFIG>]_INIT set in toolchain filesBrad King2016-07-1410-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document these variables. Change our convention for setting these variables from: set(CMAKE_EXE_LINKER_FLAGS_INIT "...") to string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ...") so that any value previously set by a toolchain file will be used.
* | | FindOpenMP: Detect version (specification date) from compilerSujin Philip2016-07-131-0/+5
|/ / | | | | | | | | | | Port changes from VTK commit fda6a31cb9 (Added Improved FindOpenMP module, 2015-04-23). Improve use of try_compile to avoid needing to pass OpenMP flags as libraries.
* | Merge topic 'findicu'Brad King2016-07-133-0/+7
|\ \ | | | | | | | | | | | | | | | e3bff7b3 Help: Add notes for topic 'findicu' 4a63be15 FindICU: New module