mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 14:50:10 -06:00
Code Issues Packages Projects Releases Wiki Activity
34,974 Commits 2 Branches 385 Tags
db431ecfe33dbfa9eb43e4edd72ebc35b2c7c563
Commit Graph

34974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Holtermann
db431ecfe3 Autogen: Merge FindInIncludeDirectories into FindIncludeFile 2017-03-01 15:30:28 +01: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
Kitware Robot
e9cfe63dfc CMake Nightly Date Stamp 2017-03-01 00: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
Brad King
c1aaf8a61d Fix CMAKE_HOST_SYSTEM_NAME on SunOS 
In commit 0bbd993f (Make CMAKE_HOST_SYSTEM_NAME available in scripting
context, 2016-12-26) we added a call to `uname` that checks for a zero
return value.  However, on Solaris the `uname(2)` manual [1] says that
on success a non-negative value is returned.  Fix our return code check
so that we detect the `SunOS` name correctly.

[1] https://docs.oracle.com/cd/E53394_01/html/E54765/uname-2.html
 2017-02-27 10:30:45 -05:00
Dmitry Kochkin
73a6d4566a VS: Cache the list of xaml and resx headers 
Speed up VS project generation with many such headers.
 2017-02-27 09:22:08 -05:00
Gregor Jasny
ded616bdad cmListFileLexer: bail out on seek-errors 
If we are given a FIFO, for example, we cannot seek back after trying to
read a Byte-Order-Mark.

Closes: #16607
 2017-02-27 09:14:28 -05:00
Brad King
cdb6d7df97 Merge branch 'release' 2017-02-27 09:12:42 -05:00
Brad King
aa45291e7f Merge branch 'release-3.7' 2017-02-27 09:12:29 -05:00
Brad King
f79efeac79 Merge topic 'ExternalProject-checkout-clarify' 
a9fa6a2c ExternalProject: Run `git checkout` with `--` to clarify arguments
 2017-02-27 09:11:25 -05:00
Brad King
e348d8db55 Merge topic 'object-library-compile-pdb' 
feff52d4 Fix COMPILE_PDB_NAME when used on an OBJECT library
 2017-02-27 09:11:22 -05:00
Brad King
9b02283a1f Merge topic 'test-objlib-deps-cleanup' 
b35a949b Tests: Change RunCMake.ObjectLibrary dependencies case to C
01347954 Tests: Fix RunCMake.ObjectLibrary dependency delay
 2017-02-27 09:11:20 -05:00
Brad King
73909e2421 Merge topic 'ninja-no-full-path' 
666ad1df Revert "Ninja: Use full path for all source files"
 2017-02-27 09:11:17 -05:00
Brad King
29528cc33e libarchive: Remove liblzma from introspection tests 
This was added upstream but does not make sense in CMake because we
may replace the library with a logical target name that will not
work inside a `try_compile`.
 2017-02-27 08:53:08 -05:00
Brad King
62d0e22325 Merge branch 'upstream-LibArchive' into update-libarchive 
* upstream-LibArchive:
  LibArchive 2017-02-25 (d6b1bb9f)
 2017-02-27 08:51:36 -05:00
LibArchive Upstream
059aa805c9 LibArchive 2017-02-25 (d6b1bb9f) 
Code extracted from:

    https://github.com/libarchive/libarchive.git

at commit d6b1bb9f7ea7bc153b7356e8e345c9e48005821a (v3.3.1).
 2017-02-27 08:47:35 -05:00
Brad King
5fee76606b libarchive: Update script to get 3.3.1 2017-02-27 08:47:11 -05:00
Kitware Robot
adcade6088 CMake Nightly Date Stamp 2017-02-27 00:01:03 -05:00
Sebastian Holtermann
48b56504bf Autogen: Fix for Q_PLUGIN_METADATA change detection test 2017-02-26 19:05:56 +01:00
Brad King
c9b3c5625a libuv: Link to 'rt' library on Solaris 10 to get semaphores 2017-02-26 10:48:26 -05:00