summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Modules: Make imported targets fall back to `Release`Brad King2016-08-037-63/+63
| | | | | | | | | | | | Find modules only detect Debug and Release configurations. All other configurations will fall back to the configuration listed as the first entry in `IMPORTED_CONFIGURATIONS`. Switch the order so that `Release` is listed first, as this is a better fallback than `Debug` for the `RelWithDebInfo` and `MinSizeRel` configurations. See issue #16091. This approach is recommended by documentation in `cmake-developer(7)` added by commit v3.2.0-rc1~286^2~1 (Help: Document IMPORTED_CONFIGURATIONS target property for Find modules, 2014-12-04).
* Merge topic 'ccmake-vim-navigation'Brad King2016-08-034-15/+30
|\ | | | | | | | | | | | | 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-024-12/+27
| | | | | | | | | | | | * 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
| * ccmake: Revise documentation for [d]Paul Seyfert2016-08-021-2/+2
| | | | | | | | | | * list it at the bottom of the screen * different place in help message
| * ccmake: Fix typo in help (it's -> its)Paul Seyfert2016-08-021-1/+1
| |
* | Merge topic 'CMakeFindFrameworks-custom-locations'Brad King2016-08-031-1/+7
|\ \ | | | | | | | | | | | | 9970cdcb CMakeFindFrameworks: Allow custom framework locations
| * | CMakeFindFrameworks: Allow custom framework locationsDavid Keller2016-08-021-1/+7
| |/ | | | | | | | | | | | | Read a variable to get non-standard locations to be searched, e.g. brew, port. Signed-off-by: David Keller <david.keller@litchis.fr>
* | Merge topic 'gcc-fvisibility-version'Brad King2016-08-031-1/+1
|\ \ | | | | | | | | | | | | 85e03142 GNU: Use -fvisibility on GCC 4.0 and 4.1 too
| * | GNU: Use -fvisibility on GCC 4.0 and 4.1 tooBrad King2016-08-021-1/+1
| |/ | | | | | | | | | | | | This flag is needed for the `<LANG>_VISIBILITY_PRESET` target property. It has been supported since GCC 4.0, not 4.2 as we previously recorded. Fixes #16222.
* | Merge topic 'FindProtobuf-restore-PROTOBUF_IMPORT_DIRS'Brad King2016-08-031-0/+8
|\ \ | | | | | | | | | | | | 5790d9b6 FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRS
| * | FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRSKonstantin Sinitsyn2016-08-021-0/+8
| | | | | | | | | | | | | | | | | | Support was accidentally dropped by commit v3.6.0-rc1~273^2 (FindProtobuf: Rename variables to match case of module name, 2016-03-01).
* | | Merge topic 'port-to-sco'Brad King2016-08-032-2/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | 56539d89 SCO_SV: Enable so filename versioning 16a3a735 cmELF: Port to SCO OpenServer 5.0.7/3.2
| * | | SCO_SV: Enable so filename versioningPatrick Welche2016-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take changes used by pkgsrc [1]: * so filename versioning requires CMAKE_SHARED_LIBRARY_SONAME_C_FLAG. [1] http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/devel/cmake/patches/
| * | | cmELF: Port to SCO OpenServer 5.0.7/3.2Patrick Welche2016-08-021-2/+11
| | |/ | |/| | | | | | | | | | | | | | | | | | | Take changes used by pkgsrc [1]: * SCO OpenServer 5.0.7/3.2 does not support 64-bit ELF. [1] http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/devel/cmake/patches/
* | | Merge topic 'ExternalProject-no-DS_Store'Brad King2016-08-031-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 52aecc0c ExternalProject: Ignore macOS .DS_Store files in tarball extraction
| * | | ExternalProject: Ignore macOS .DS_Store files in tarball extractionBrad King2016-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not consider a top-level `.DS_Store` file when deciding whether a tarball contains exactly one directory whose contents should be used as the resulting top-level of the extraction. Fixes #16218. Suggested-by: Patrice Kouame
* | | | Merge topic 'update-kwsys'Brad King2016-08-033-12/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 35995fa6 Merge branch 'upstream-KWSys' into update-kwsys 6bc3073e KWSys 2016-08-01 (560bcdbb)
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-08-023-12/+29
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-08-01 (560bcdbb)
| | * | | KWSys 2016-08-01 (560bcdbb)KWSys Upstream2016-08-023-12/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 560bcdbb972cbf4c7ea77010363c652b697b9933 (master). Upstream Shortlog ----------------- Brad King (1): 560bcdbb SystemTools: Factor out common `const char* GetEnv()` private implementation James Johnston (1): 1c147abb Directory: Use Windows API wherever possible and port to Embarcadero
* | | | | Merge topic 'wix-root-description'Brad King2016-08-033-1/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e29bfbf2 CPackWIX: Support custom title and description for the root feature
| * | | | | CPackWIX: Support custom title and description for the root featureMichael Stürmer2016-08-023-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These can now be specified through the WIX generator specific CPack variables CPACK_WIX_ROOT_FEATURE_TITLE and CPACK_WIX_ROOT_FEATURE_DESCRIPTION.
* | | | | | Merge topic 'FindCUDA-no-windows-librt'Brad King2016-08-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4e979b1 FindCUDA: Do not look for librt on Windows
| * | | | | | FindCUDA: Do not look for librt on WindowsStephen Sorley2016-08-021-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Otherwise an incorrect warning appears when compiling with CUDA SDK 6.5 or older and CUDA_USE_STATIC_CUDA_RUNTIME is true.
* | | | | | Merge topic 'FindCUDA-arch'Brad King2016-08-031-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15a6ae5c FindCUDA: Add search path for nvcc on Arch
| * | | | | | FindCUDA: Add search path for nvcc on ArchHans Gaiser2016-08-021-1/+2
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'doc-without-continue'Brad King2016-08-031-8/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d7446c9 Utilities/Sphinx: Remove use of continue() method
| * | | | | | Utilities/Sphinx: Remove use of continue() methodKonstantin Podsvirov2016-08-021-8/+11
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | We currently only require CMake 2.8.4 which does not provide it.
* | | | | | Merge topic 'intel-gnu11-support'Brad King2016-08-031-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 088f14eb Intel-C: standard flags are also supported in 12.0 27a3ca15 Intel-C: support gnu89 and gnu99 extension flags cc223e1e Intel-C: declare support for gnu11
| * | | | | | Intel-C: standard flags are also supported in 12.0Ben Boeckel2016-08-021-1/+1
| | | | | | |
| * | | | | | Intel-C: support gnu89 and gnu99 extension flagsBen Boeckel2016-08-021-2/+2
| | | | | | |
| * | | | | | Intel-C: declare support for gnu11Ben Boeckel2016-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without extensions, functions like `strdup` are not available since they are actually controlled by feature flags such as _SVID_SOURCE and _BSD_SOURCE. When using `-std=c11` on Intel, none of these flags are set, so the functions are not declared properly leading to compile errors. Reported-by: Adam J. Stewart <ajstewart426@gmail.com> Closes: #16226
* | | | | | | Merge topic 'fix-findhdf5-definitions'Brad King2016-08-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8eb0b56c FindHDF5: Make sure compile definition vars keep the -D flag
| * | | | | | | FindHDF5: Make sure compile definition vars keep the -D flagChuck Atkins2016-08-021-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2016-08-031-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge topic 'doc-CMAKE_INSTALL_PREFIX-default'Brad King2016-08-021-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | bdd9b1c7 Help: Fix CMAKE_INSTALL_PREFIX documented default on Windows
| * | | | | Help: Fix CMAKE_INSTALL_PREFIX documented default on WindowsBrad King2016-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #16211.
* | | | | | CMake Nightly Date StampKitware Robot2016-08-021-1/+1
|/ / / / /
* | | | | Merge topic 'emacs-mode-compilation-warning'Brad King2016-08-011-8/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82388543 cmake-mode.el: Replace use of obsolete function (since Emacs 24.3). ca684ccb cmake-mode.el: Fix byte-compilation warnings.
| * | | | | cmake-mode.el: Replace use of obsolete function (since Emacs 24.3).Jostein Kjønigsen2016-08-011-1/+1
| | | | | |
| * | | | | cmake-mode.el: Fix byte-compilation warnings.Jostein Kjønigsen2016-07-261-7/+8
| | | | | |
* | | | | | Merge topic 'vim-syntax-updates'Brad King2016-08-011-10/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd7ed47c Aux: highlight commands using Function bca8be58 Aux: sort the highlighting list 7decbe8f Aux: highlight CMAKE_{CMAKE,CPACK}_COMMAND variables 2b57b139 Aux: highlight modules using Include 8ac4e2cf Aux: highlight conditiona and repeat commands differently 3b3bd880 Aux: highlight deprecated commands as warnings 481f8cf1 Aux: remove unused highlight links ffa44a39 Aux: highlight Lua-style comments 29eeb9a8 Aux: check spelling in comments
| * | | | | | Aux: highlight commands using FunctionBen Boeckel2016-07-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are closer to functions than anything else. Also change the other groups which were highlighted with Function to other groups.
| * | | | | | Aux: sort the highlighting listBen Boeckel2016-07-221-3/+3
| | | | | | |
| * | | | | | Aux: highlight CMAKE_{CMAKE,CPACK}_COMMAND variablesBen Boeckel2016-07-221-1/+1
| | | | | | |
| * | | | | | Aux: highlight modules using IncludeBen Boeckel2016-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | They are closer to Include than generic preprocessor lines.
| * | | | | | Aux: highlight conditiona and repeat commands differentlyBen Boeckel2016-07-221-1/+9
| | | | | | |
| * | | | | | Aux: highlight deprecated commands as warningsBen Boeckel2016-07-221-1/+5
| | | | | | |
| * | | | | | Aux: remove unused highlight linksBen Boeckel2016-07-221-2/+0
| | | | | | |
| * | | | | | Aux: highlight Lua-style commentsBen Boeckel2016-07-221-0/+2
| | | | | | |
| * | | | | | Aux: check spelling in commentsBen Boeckel2016-07-221-1/+1
| | | | | | |