Commit Graph

32385 Commits

Author SHA1 Message Date
Konstantin Sinitsyn 5790d9b6f5 FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRS
Support was accidentally dropped by commit v3.6.0-rc1~273^2
(FindProtobuf: Rename variables to match case of module name,
2016-03-01).
2016-08-02 10:50:24 -04:00
David Keller 9970cdcb59 CMakeFindFrameworks: Allow custom framework locations
Read a variable to get non-standard locations to be searched,
e.g. brew, port.

Signed-off-by: David Keller <david.keller@litchis.fr>
2016-08-02 10:41:40 -04:00
Chuck Atkins 8eb0b56c2a FindHDF5: Make sure compile definition vars keep the -D flag 2016-08-02 10:34:51 -04:00
Brad King 52aecc0c38 ExternalProject: Ignore macOS .DS_Store files in tarball extraction
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
2016-08-02 10:14:26 -04:00
Patrick Welche 56539d89da SCO_SV: Enable so filename versioning
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/
2016-08-02 10:09:52 -04:00
Patrick Welche 16a3a73508 cmELF: Port to SCO OpenServer 5.0.7/3.2
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/
2016-08-02 10:04:31 -04:00
Brad King 85e0314201 GNU: Use -fvisibility on GCC 4.0 and 4.1 too
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.
2016-08-02 09:24:54 -04:00
Brad King 35995fa6b5 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2016-08-01 (560bcdbb)
2016-08-02 09:21:52 -04:00
KWSys Upstream 6bc3073e23 KWSys 2016-08-01 (560bcdbb)
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
2016-08-02 09:21:31 -04:00
Stephen Sorley f4e979b126 FindCUDA: Do not look for librt on Windows
Otherwise an incorrect warning appears when compiling with CUDA SDK 6.5
or older and CUDA_USE_STATIC_CUDA_RUNTIME is true.
2016-08-02 09:15:22 -04:00
Brad King fd59f9ad51 Merge topic 'doc-CMAKE_INSTALL_PREFIX-default'
bdd9b1c7 Help: Fix CMAKE_INSTALL_PREFIX documented default on Windows
2016-08-02 09:11:52 -04:00
Michael Stürmer e29bfbf272 CPackWIX: Support custom title and description for the root feature
These can now be specified through the WIX generator specific
CPack variables CPACK_WIX_ROOT_FEATURE_TITLE and
CPACK_WIX_ROOT_FEATURE_DESCRIPTION.
2016-08-02 14:05:08 +02:00
Kitware Robot 55d9bfa9dd CMake Nightly Date Stamp 2016-08-02 00:01:04 -04:00
Brad King bdd9b1c73c Help: Fix CMAKE_INSTALL_PREFIX documented default on Windows
Fixes #16211.
2016-08-01 15:29:11 -04:00
Brad King 5f99e61cad Merge topic 'emacs-mode-compilation-warning'
82388543 cmake-mode.el: Replace use of obsolete function (since Emacs 24.3).
ca684ccb cmake-mode.el: Fix byte-compilation warnings.
2016-08-01 15:15:39 -04:00
Jostein Kjønigsen 82388543d2 cmake-mode.el: Replace use of obsolete function (since Emacs 24.3). 2016-08-01 15:13:43 -04:00
Brad King b1cd292335 Merge topic 'vim-syntax-updates'
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
2016-08-01 15:04:37 -04:00
Brad King 5ec03c93fc Merge topic 'wix-disabled-components'
ad453f05 CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLED
6f108f84 CPackComponent: Document the *_HIDDEN and *_DISABLED variables
2016-08-01 14:59:53 -04:00
Brad King 88e1c54a7c Merge topic 'use-string-append'
7a649111 Use string(APPEND) in Tests
5d0d980d Use string(APPEND) in Modules
2016-08-01 14:59:50 -04:00
Brad King bfac78d074 Merge topic 'more-virtual-override'
624b7215 Source/CPack: Add CM_OVERRIDE on MacOS cmCPackGenerator overrides
2016-08-01 14:59:47 -04:00
Brad King 2711c35a8d Merge topic 'app-framework-bundle-extension'
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)
2016-08-01 14:59:44 -04:00
Brad King 8427b8e11c Merge topic 'aliased-target-properties'
ea647533 Do not report ALIASED_TARGET as always set (#15783)
2016-08-01 14:59:41 -04:00
Kitware Robot 8b9cd61337 CMake Nightly Date Stamp 2016-08-01 00:01:03 -04:00
Kitware Robot 963c4e4b90 CMake Nightly Date Stamp 2016-07-31 00:01:03 -04:00
Kitware Robot 99f5a32c7a CMake Nightly Date Stamp 2016-07-30 00:01:02 -04:00
Kitware Robot db713223a8 CMake Nightly Date Stamp 2016-07-29 00:01:03 -04:00
Kitware Robot 09a86b392e CMake Nightly Date Stamp 2016-07-28 00:01:04 -04:00
Daniel Pfeifer 7a649111cd Use string(APPEND) in Tests
Automate with:

find Tests -type f -print0 | xargs -0 perl -i -0pe \
's/set\(([a-zA-Z0-9_]+)(\s+)"\$\{\1\}([^"])/string(APPEND \1\2"\3/g'
2016-07-28 00:43:04 +02:00
Daniel Pfeifer 5d0d980d99 Use string(APPEND) in Modules
Automate with:

find Modules -type f -print0 | xargs -0 perl -i -0pe \
's/set\(([a-zA-Z0-9_]+)(\s+)"\$\{\1\}([^"])/string(APPEND \1\2"\3/g'
2016-07-28 00:41:13 +02:00
Kitware Robot 73c618be70 CMake Nightly Date Stamp 2016-07-27 00:01:03 -04:00
Jostein Kjønigsen ca684ccb46 cmake-mode.el: Fix byte-compilation warnings. 2016-07-26 14:41:02 +02:00
Kitware Robot 8f884f2146 CMake Nightly Date Stamp 2016-07-26 00:01:02 -04:00
Kitware Robot 3d57541d6d CMake Nightly Date Stamp 2016-07-25 00:01:07 -04:00
Kitware Robot ffc7c24b2e CMake Nightly Date Stamp 2016-07-24 00:01:03 -04:00
Kitware Robot d615d20a63 CMake Nightly Date Stamp 2016-07-23 00:01:04 -04:00
Ben Boeckel cd7ed47c4a Aux: highlight commands using Function
These are closer to functions than anything else. Also change the other
groups which were highlighted with Function to other groups.
2016-07-22 12:33:23 -04:00
Ben Boeckel bca8be583e Aux: sort the highlighting list 2016-07-22 12:32:40 -04:00
Ben Boeckel 7decbe8ffb Aux: highlight CMAKE_{CMAKE,CPACK}_COMMAND variables 2016-07-22 12:32:05 -04:00
Ben Boeckel 2b57b13920 Aux: highlight modules using Include
They are closer to Include than generic preprocessor lines.
2016-07-22 12:31:26 -04:00
Ben Boeckel 8ac4e2cfa2 Aux: highlight conditiona and repeat commands differently 2016-07-22 12:30:57 -04:00
Ben Boeckel 3b3bd880a3 Aux: highlight deprecated commands as warnings 2016-07-22 12:30:44 -04:00
Ben Boeckel 481f8cf1cc Aux: remove unused highlight links 2016-07-22 12:24:23 -04:00
Ben Boeckel ffa44a39c9 Aux: highlight Lua-style comments 2016-07-22 12:23:53 -04:00
Ben Boeckel 29eeb9a8fd Aux: check spelling in comments 2016-07-22 12:23:16 -04:00
Brad King 624b72159b Source/CPack: Add CM_OVERRIDE on MacOS cmCPackGenerator overrides 2016-07-22 10:42:37 -04:00
Brad King 8842a501cf Merge branch 'release' 2016-07-22 10:34:05 -04:00
Brad King f59513140b CMake 3.6.1 2016-07-22 09:26:11 -04:00
Brad King 4e88b1ec17 Merge branch 'release' 2016-07-22 09:22:53 -04:00
Brad King d504999d86 Merge topic 'tests-hide-ldd-check-errors'
d6a6024e Tests: Hide errors from `ldd --help` output check
2016-07-22 09:17:53 -04:00
Brad King 1fc340f0d4 Merge topic 'windows-export-all-fix-objlib'
13a6ff31 VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for object libraries
2016-07-22 09:17:48 -04:00