kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,779 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

32779 Commits

Author SHA1 Message Date
Brad King 995b54256e Merge topic 'find-module-imported-fallback-to-release' 
ff386d11 Modules: Make imported targets fall back to `Release`
 2016-08-04 09:56:51 -04:00
Brad King 2df3719d2c Merge topic 'extra-generator-factories' 
cd52a225 Report more information about extra generators in generator factories
a354f60c Refactor extra generator registration to use factories
 2016-08-04 09:56:47 -04:00
Brad King ac7c12eced Merge topic 'update-kwsys' 
b602cb85 Merge branch 'upstream-KWSys' into update-kwsys
3e6ec47c KWSys 2016-08-02 (3f55579d)
 2016-08-04 09:56:44 -04:00
Brad King 85d966dcd7 Merge topic 'update-curl' 
f59ab433 curl: Remove CMake-specific README
f53f4a8a Merge branch 'upstream-curl' into update-curl
202adcfe curl 2016-08-03 (f2cb3a01)
e1c11352 curl: Update script to get curl 7.50.1
a51c6c53 Merge branch 'upstream-curl' into update-curl
7ec709d3 curl 2015-08-11 (1a7f66a3)
3e9b0343 Add script to update curl from upstream
 2016-08-04 09:56:39 -04:00
Brad King e555480c60 Ninja: Fix response file format for GNU-like Clang on Windows 
The `CMAKE_<LANG>_SIMULATE_ID` variables are not set to "GNU" for a
GNU-like Clang compiler on Windows.  They are only set to "MSVC" for a
MSVC-like Clang.  Revise our response file format selection accordingly.

Reported-by: Chaoren Lin <chaorenl@google.com>
 2016-08-04 09:44:56 -04:00
Kitware Robot 2c0e87fff3 CMake Nightly Date Stamp 2016-08-04 00:01:06 -04:00
Brad King 5bcbc3857f Merge branch 'update-curl' into release 2016-08-03 15:08:56 -04:00
Brad King f59ab43370 curl: Remove CMake-specific README 
We will now manage the curl source tree updates using
the `Utilities/Scripts/update-curl.bash` script.  Drop
the README that covered the old method.
 2016-08-03 14:31:05 -04:00
Brad King f53f4a8a2d Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2016-08-03 (f2cb3a01)
 2016-08-03 14:26:53 -04:00
Curl Upstream 202adcfe05 curl 2016-08-03 (f2cb3a01) 
Code extracted from:

    https://github.com/bagder/curl.git

at commit f2cb3a01192d36395d16acec6cdb93446ca6fd45 (curl-7_50_1).
 2016-08-03 14:26:29 -04:00
Brad King e1c11352f2 curl: Update script to get curl 7.50.1 2016-08-03 14:26:02 -04:00
Brad King a51c6c5394 Merge branch 'upstream-curl' into update-curl 2016-08-03 11:54:18 -04:00
Curl Upstream 7ec709d3d7 curl 2015-08-11 (1a7f66a3) 
Code extracted from:

    https://github.com/bagder/curl.git

at commit 1a7f66a3de2625d10f65415e6eb3e56067dc0555 (curl-7_44_0).
 2016-08-03 11:52:06 -04:00
Brad King 3e9b03439f Add script to update curl from upstream 2016-08-03 11:51:27 -04:00
Brad King ff386d1121 Modules: Make imported targets fall back to `Release` 
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).
 2016-08-03 11:14:29 -04:00
Brad King b602cb85c9 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-08-02 (3f55579d)
 2016-08-03 10:10:28 -04:00
KWSys Upstream 3e6ec47c42 KWSys 2016-08-02 (3f55579d) 
Code extracted from:

    http://public.kitware.com/KWSys.git

at commit 3f55579d113f92fcda8f9eff7046c36873c121f6 (master).

Upstream Shortlog
-----------------

Patrick Welche (3):
      8a989b44 SystemInformation: Treat BSDs more uniformly
      2ce319a6 SystemInformation: Treat Solaris the same as Linux
      3f55579d SystemTools: Fix FileExists for some SCO OpenServer file permissions
 2016-08-03 10:10:21 -04:00
Tobias Hunger cd52a225d2 Report more information about extra generators in generator factories 2016-08-03 09:44:40 -04:00
Tobias Hunger a354f60ce0 Refactor extra generator registration to use factories 
This will allow additional information about the availability
and capabilities of extra generators to be queried without
actually creating them.

Instead of a static NewFactory() method like the main generator
factories have, use a static GetFactory() method to get a pointer to a
statically allocated extra generator factory.  This simplifies memory
management.
 2016-08-03 09:43:00 -04:00
Brad King 382c4fca6b Merge topic 'ccmake-vim-navigation' 
e34e9c27 ccmake: Add VIM-like bindings for navigation
9a1b6c60 ccmake: Revise documentation for [d]
31b6cf41 ccmake: Fix typo in help (it's -> its)
 2016-08-03 09:20:59 -04:00
Brad King c2bc47f266 Merge topic 'CMakeFindFrameworks-custom-locations' 
9970cdcb CMakeFindFrameworks: Allow custom framework locations
 2016-08-03 09:20:56 -04:00
Brad King aabf8772fd Merge topic 'gcc-fvisibility-version' 
85e03142 GNU: Use -fvisibility on GCC 4.0 and 4.1 too
 2016-08-03 09:20:54 -04:00
Brad King a85e2a89de Merge topic 'FindProtobuf-restore-PROTOBUF_IMPORT_DIRS' 
5790d9b6 FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRS
 2016-08-03 09:20:50 -04:00
Brad King ec807f6edf Merge topic 'port-to-sco' 
56539d89 SCO_SV: Enable so filename versioning
16a3a735 cmELF: Port to SCO OpenServer 5.0.7/3.2
 2016-08-03 09:20:47 -04:00
Brad King ef729c5bc2 Merge topic 'ExternalProject-no-DS_Store' 
52aecc0c ExternalProject: Ignore macOS .DS_Store files in tarball extraction
 2016-08-03 09:20:44 -04:00
Brad King f8792c12b9 Merge topic 'update-kwsys' 
35995fa6 Merge branch 'upstream-KWSys' into update-kwsys
6bc3073e KWSys 2016-08-01 (560bcdbb)
 2016-08-03 09:20:41 -04:00
Brad King 7b65e49529 Merge topic 'wix-root-description' 
e29bfbf2 CPackWIX: Support custom title and description for the root feature
 2016-08-03 09:20:38 -04:00
Brad King 8ba870bad6 Merge topic 'FindCUDA-no-windows-librt' 
f4e979b1 FindCUDA: Do not look for librt on Windows
 2016-08-03 09:20:35 -04:00
Brad King 573397bb54 Merge topic 'FindCUDA-arch' 
15a6ae5c FindCUDA: Add search path for nvcc on Arch
 2016-08-03 09:20:32 -04:00
Brad King 4b0e1dc0a4 Merge topic 'doc-without-continue' 
7d7446c9 Utilities/Sphinx: Remove use of continue() method
 2016-08-03 09:20:29 -04:00
Brad King 16e449cc72 Merge topic 'intel-gnu11-support' 
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
 2016-08-03 09:20:25 -04:00
Brad King a382c3013c Merge topic 'fix-findhdf5-definitions' 
8eb0b56c FindHDF5: Make sure compile definition vars keep the -D flag
 2016-08-03 09:20:19 -04:00
Brad King 236050153c Merge branch 'intel-gnu11-support' into release 2016-08-03 09:16:49 -04:00
Kitware Robot 33fe4751e8 CMake Nightly Date Stamp 2016-08-03 00:01:04 -04:00
Hans Gaiser 15a6ae5cb7 FindCUDA: Add search path for nvcc on Arch 2016-08-02 15:36:07 -04:00
Konstantin Podsvirov 7d7446c905 Utilities/Sphinx: Remove use of continue() method 
We currently only require CMake 2.8.4 which does not provide it.
 2016-08-02 15:15:00 -04:00
Paul Seyfert e34e9c2705 ccmake: Add VIM-like bindings for navigation 
* 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
 2016-08-02 14:53:15 -04:00
Paul Seyfert 9a1b6c6037 ccmake: Revise documentation for [d] 
* list it at the bottom of the screen
* different place in help message
 2016-08-02 14:53:15 -04:00
Paul Seyfert 31b6cf41c5 ccmake: Fix typo in help (it's -> its) 2016-08-02 14:53:06 -04:00
Ben Boeckel 088f14eb72 Intel-C: standard flags are also supported in 12.0 2016-08-02 13:10:56 -04:00
Ben Boeckel 27a3ca15e5 Intel-C: support gnu89 and gnu99 extension flags 2016-08-02 13:10:41 -04:00
Ben Boeckel cc223e1eed Intel-C: declare support for gnu11 
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
 2016-08-02 11:42:45 -04:00
Brad King 88f4b4c9e0 Merge branch 'fix-findhdf5-definitions' into release 2016-08-02 10:54:03 -04:00
Brad King 3c57905dcf Merge branch 'FindProtobuf-restore-PROTOBUF_IMPORT_DIRS' into release 2016-08-02 10:52:36 -04:00
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