Commit Graph

34990 Commits

Author SHA1 Message Date
Brad King 6d9ab1eff7 Merge topic 'FindHDF5-updates'
2186b323 FindHDF5: initialize HDF5_DEFINITIONS when using hdf5-config.cmake
16f1dd0d FindHDF5: document HDF5_<LANG>_DEFINITIONS
b2de6da2 FindHDF5: use import libraries when using hdf5-config.cmake on Windows
003c9138 FindHDF5: do not cache library locations when using hdf5-config.cmake
bf67fff0 FindHDF5: recognize hdf5:: prefix when using hdf5-config.cmake
e629be4a FindHDF5: fix typo in comment
1c7a9119 FindHDF5: remove mark_as_advanced for non-cached variables
8250a520 FindHDF5: add HDF5_FIND_DEBUG variable to get debugging output
4b847f12 FindHDF5: hide HDF5_DIR if HDF5 was found in another way
2017-03-02 09:25:59 -05:00
Brad King 2187818706 Merge topic 'xcode-enhance-schemes'
54a48c67 Xcode: Use proper buildable name for schema
f4977d05 Xcode: Select executable target for execution in schema
7202db5d Xcode: Fix schema container location calculation
59950821 Xcode: Do not autocreate schemes
6a54d28e Xcode: Use proper indentation for schemes
2017-03-02 09:25:54 -05:00
Kitware Robot a52d35b8ef CMake Nightly Date Stamp 2017-03-02 00:01:03 -05:00
Brad King ebc28c156e Merge branch 'release' 2017-03-01 09:03:02 -05:00
Brad King 66bdc792a0 Merge branch 'release-3.7' 2017-03-01 09:02:38 -05:00
Brad King f782b31368 Merge topic 'FindPkgConfig-version-ops'
8d71fa92 FindPkgConfig: use new version checking "library >= version" syntax
2017-03-01 09:00:46 -05:00
Brad King 86563cf7c8 Merge topic 'export-executable-symbols'
85e08370 bindexplib: Always export executable symbols, even they are also readable
2017-03-01 09:00:43 -05:00
Brad King 4fc64ce76d Merge topic 'find-libarch-not-symlink'
6f5aede7 find_library: Skip 'lib => lib<arch>' searches if one symlinks the other
e67963ed cmFindLibraryCommand: Refactor AddArchitecturePath logic
2017-03-01 09:00:40 -05:00
Brad King a9113ae37b Merge topic 'autogen_json_fix'
48b56504 Autogen: Fix for Q_PLUGIN_METADATA change detection test
2017-03-01 09:00:37 -05:00
Kris Thielemans 2186b323c0 FindHDF5: initialize HDF5_DEFINITIONS when using hdf5-config.cmake 2017-03-01 08:13:58 -05:00
Kris Thielemans 16f1dd0d16 FindHDF5: document HDF5_<LANG>_DEFINITIONS 2017-03-01 08:13:58 -05:00
Kris Thielemans b2de6da2f1 FindHDF5: use import libraries when using hdf5-config.cmake on Windows
The `LOCATION` of imported shared libraries on Windows is that of the
`.dll`.  Use the import library instead to get the `.lib` to be linked.

Fixes: #16534
2017-03-01 08:12:56 -05:00
Kris Thielemans 003c91385a FindHDF5: do not cache library locations when using hdf5-config.cmake
The imported targets provide a persistent reference of their location,
so we do not need to cache the values.
2017-03-01 08:11:37 -05:00
Kris Thielemans bf67fff035 FindHDF5: recognize hdf5:: prefix when using hdf5-config.cmake
Some versions of HDF5 use this prefix on their imported targets.
2017-03-01 08:11:22 -05:00
Kris Thielemans e629be4a7a FindHDF5: fix typo in comment 2017-03-01 08:06:26 -05:00
Kris Thielemans 1c7a9119d2 FindHDF5: remove mark_as_advanced for non-cached variables 2017-03-01 08:06:26 -05:00
Kitware Robot e9cfe63dfc CMake Nightly Date Stamp 2017-03-01 00:01:04 -05:00
Gregor Jasny 54a48c6781 Xcode: Use proper buildable name for schema 2017-02-28 22:38:30 +01:00
Gregor Jasny f4977d056b Xcode: Select executable target for execution in schema 2017-02-28 22:38:29 +01:00
Gregor Jasny 7202db5db4 Xcode: Fix schema container location calculation 2017-02-28 22:38:29 +01:00
Gregor Jasny 5995082101 Xcode: Do not autocreate schemes 2017-02-28 22:38:29 +01:00
Gregor Jasny 6a54d28e44 Xcode: Use proper indentation for schemes 2017-02-28 22:27:21 +01:00
Kris Thielemans 8250a520aa FindHDF5: add HDF5_FIND_DEBUG variable to get debugging output 2017-02-28 16:10:11 -05:00
Kris Thielemans 4b847f12f6 FindHDF5: hide HDF5_DIR if HDF5 was found in another way 2017-02-28 16:01:04 -05:00
Brad King baed38107e Merge branch 'find-libarch-not-symlink' into release 2017-02-28 15:57:54 -05:00
Brad King f566ab2747 Merge branch 'find-libarch-not-symlink' into release-3.7 2017-02-28 15:57:37 -05:00
Brad King 6f5aede716 find_library: Skip 'lib => lib<arch>' searches if one symlinks the other
The `FIND_LIBRARY_USE_LIB<arch>_PATHS` global properties ask
`find_library` to look in `lib<arch>` directories automatically before
corresponding `lib` directories.  However, if `lib<arch>` is just a
symlink to `lib` (or vice-versa) then we should skip adding the
`lib<arch>` path.  Such symlinks typically only exist to satisfy
software that expects the `lib<arch>` path to be available.

Fixes: #16687
2017-02-28 14:56:54 -05:00
Brad King e67963ed73 cmFindLibraryCommand: Refactor AddArchitecturePath logic
Use boolean variables to save results and rename variables to more
closely represent their roles.
2017-02-28 14:56:13 -05:00
Zsolt Parragi 85e08370d0 bindexplib: Always export executable symbols, even they are also readable
Previously bindexplib discarded read-only non-function symbols even in
executable/code sections, but in some specific cases they could still mark
functions.

An example is provided by nop.asm in the AuoExportDll test, which exports
a function only marked by a label. This symbol can be used from C/C++
code, but without this change it would result in an unresolved external
symbol when built as a DLL on Windows.
2017-02-28 09:49:12 -05:00
Brad King 78104bd7bc Merge branch 'release' 2017-02-28 09:44:12 -05:00
Brad King 2ca029d9a8 Merge topic 'kwiml-test-gcc-format-security'
4ca77bb6 KWIML: Add -Wno-format-security to tolerate -Werror=format-security
2017-02-28 09:43:49 -05:00
Brad King 30243e7faf Merge topic '16607-error-out-on-non-seekable-input-files'
ded616bd cmListFileLexer: bail out on seek-errors
2017-02-28 09:39:21 -05:00
Brad King dda1805f27 Merge topic 'ExternalProject-fix-download-log'
99d6de6c ExternalProject: only append `COMMAND` if actually adding a command
2017-02-28 09:39:19 -05:00
Brad King 322472e571 Merge topic 'cache-xaml-resx-headers'
73a6d456 VS: Cache the list of xaml and resx headers
2017-02-28 09:39:16 -05:00
Brad King 0aec4d3864 Merge topic 'cmake-xcode-schemes'
7238a052 Xcode: Add documentation for schema generator
ffb8817b Xcode: Write shared schemes based on the default files generated by Xcode
2017-02-28 09:39:12 -05:00
Gregor Jasny 7238a052b9 Xcode: Add documentation for schema generator 2017-02-28 09:22:11 -05:00
Gusts Kaksis ffb8817b37 Xcode: Write shared schemes based on the default files generated by Xcode
Issue: #15441
2017-02-28 09:21:54 -05:00
Brad King 6403cda149 Merge topic 'update-kwiml'
f77420cf Merge branch 'upstream-KWIML' into update-kwiml
ae6607af KWIML 2017-02-27 (aa3a7733)
2017-02-28 09:11:47 -05:00
Brad King 6a8da1d777 Merge topic 'update-libarchive'
29528cc3 libarchive: Remove liblzma from introspection tests
62d0e223 Merge branch 'upstream-LibArchive' into update-libarchive
059aa805 LibArchive 2017-02-25 (d6b1bb9f)
5fee7660 libarchive: Update script to get 3.3.1
2017-02-28 09:11:45 -05:00
Brad King 09a81e29fe Merge topic 'libuv-solaris-10'
a3335709 Enable libuv on Solaris 10
e4ac7c2b libuv: Compile as C 90 on Solaris 10
c9b3c562 libuv: Link to 'rt' library on Solaris 10 to get semaphores
f0698692 libuv: Implement mkdtemp on Solaris 10
5651257f libuv: automatically skip ifaddrs on Solaris 10
2017-02-28 09:11:42 -05:00
Brad King fd6b260c40 Merge topic 'cmake-host-system-name'
c1aaf8a6 Fix CMAKE_HOST_SYSTEM_NAME on SunOS
2017-02-28 09:11:40 -05:00
Brad King a333570914 Enable libuv on Solaris 10
We've ported our libuv to this platform so we can build it now.
2017-02-28 09:03:12 -05:00
Brad King e4ac7c2b4f libuv: Compile as C 90 on Solaris 10 2017-02-28 09:03:12 -05:00
Gautier Pelloux-Prayer 8d71fa9283 FindPkgConfig: use new version checking "library >= version" syntax
Instead of the deprecated --atleast-version one.
2017-02-28 10:45:25 +01:00
Kitware Robot 8bfa6a00ea CMake Nightly Date Stamp 2017-02-28 00:01:08 -05:00
Brad King f77420cfc9 Merge branch 'upstream-KWIML' into update-kwiml
* upstream-KWIML:
  KWIML 2017-02-27 (aa3a7733)
2017-02-27 13:49:07 -05:00
KWIML Upstream ae6607af47 KWIML 2017-02-27 (aa3a7733)
Code extracted from:

    https://gitlab.kitware.com/utils/kwiml.git

at commit aa3a7733039afb11047fb7d4d71fb26e1775c106 (master).

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

Orion Poplawski (1):
      aa3a7733 test: Add -Wno-format-security to tolerate -Werror=format-security
2017-02-27 13:49:07 -05:00
Brad King 220b799c8a Merge branch 'kwiml-test-gcc-format-security' into release 2017-02-27 13:47:34 -05:00
Orion Poplawski 4ca77bb6db KWIML: Add -Wno-format-security to tolerate -Werror=format-security
When compiling KWIML tests with `-Werror=format-security` we get

    error: -Wformat-security ignored without -Wformat

Therefore we should disable both `format` and `format-security`
together.
2017-02-27 13:47:00 -05:00
Ben Boeckel 99d6de6c1a ExternalProject: only append COMMAND if actually adding a command
Fixes #16544.
2017-02-27 11:33:31 -05:00