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

31844 Commits

Author SHA1 Message Date
Stephen Kelly 54c65d5fb2 cmake: Extract DisplayMessage API. 2016-06-12 22:08:47 +02:00
Kitware Robot acf0c0f444 CMake Nightly Date Stamp 2016-06-12 00:01:09 -04:00
Kitware Robot d6e99fa834 CMake Nightly Date Stamp 2016-06-11 00:01:07 -04:00
Brad King c5d71b28ec Merge branch 'release' 2016-06-10 09:57:21 -04:00
Brad King 98aafb2ad6 Merge topic 'refactor-cmLocalGenerator-flags' 
d9613b96 cmLocalGenerator: Move GetFrameworkFlags implementation to private helper
70d3bf85 cmLocalGenerator: Adopt GetFrameworkFlags method
de4ee088 cmCommonTargetGenerator: De-duplicate CMAKE_BUILD_TYPE lookup
 2016-06-10 09:10:04 -04:00
Brad King ff4697fc94 Merge topic 'FindProtobuf-proto-in-subdirs' 
d4b8e813 FindProtobuf: fix protobuf_generate_*() to handle proto files in subdirs.
 2016-06-10 09:10:02 -04:00
Brad King fbf461dde2 Merge topic 'FindFreetype-dedup-arguments' 
746a4245 FindFreetype: Factor out common find command arguments
 2016-06-10 09:09:59 -04:00
Brad King 09e6c9eba7 Merge topic 'FindCUDA-android' 
7229ae72 FindCUDA: Refactor Android(Tegra) support
e9bfe8da FindCUDA: Adjust vertical whitespace
 2016-06-10 09:09:57 -04:00
Brad King b29f1514d0 Merge topic 'FindOpenSSL-BoringSSL' 
e937b4c3 FindOpenSSL: Do not assume that the version regex finds something
 2016-06-10 09:09:54 -04:00
Brad King 5d078868f0 Merge topic 'watcom-workaround' 
ceebac93 Tests: Restore fix to Plugin test on Watcom compiler
 2016-06-10 09:09:50 -04:00
Brad King 1bde72a390 Merge topic 'cmake-gui-osx-symlink-qt5-plugin' 
f2840155 cmake-gui: Teach Qt5 where plugins are when launched through a symlink
 2016-06-10 09:09:47 -04:00
Kitware Robot 1f9b35da10 CMake Nightly Date Stamp 2016-06-10 00:01:06 -04:00
Brad King cc7e9d1d90 Merge branch 'cmake-gui-osx-symlink-qt5-plugin' into release 2016-06-09 13:21:56 -04:00
Robert Maynard f28401554a cmake-gui: Teach Qt5 where plugins are when launched through a symlink 
When we are on OSX and we are launching cmake-gui from a symlink, the
application will fail to launch as it can't find the qt.conf file which
tells it what the name of the plugin folder is. We need to add this path
BEFORE the application is constructed as that is what triggers the
searching for the platform plugins
 2016-06-09 13:21:27 -04:00
Tobias Hunger d9613b962e cmLocalGenerator: Move GetFrameworkFlags implementation to private helper 2016-06-09 10:41:42 -04:00
Tobias Hunger 70d3bf8580 cmLocalGenerator: Adopt GetFrameworkFlags method 
Move it from cmCommonTargetGenerator.
 2016-06-09 10:39:57 -04:00
Vladimír Vondruš d4b8e81353 FindProtobuf: fix protobuf_generate_*() to handle proto files in subdirs. 2016-06-09 16:13:45 +02:00
Boris Fomitchev 7229ae728f FindCUDA: Refactor Android(Tegra) support 
Reviewed-by: James Bigler <jamesbigler@gmail.com>
 2016-06-09 09:25:55 -04:00
Boris Fomitchev e9bfe8da04 FindCUDA: Adjust vertical whitespace 2016-06-09 09:24:40 -04:00
Brad King 8f3bd1f454 Merge topic 'ninja-no-ranlib-windows' 
ea598671 Run ranlib on archives only if the tool is available
 2016-06-09 09:18:28 -04:00
Brad King c21397b2df Merge topic 'refactor-cmLocalGenerator-flags' 
b0d3e693 cmLocalGenerator: Pass configuration to GetTargetFlags
 2016-06-09 09:18:26 -04:00
Brad King 065bb0ffeb Merge topic 'small-cleanups' 
9f25fc4d Prefer std::ostream& over derivatives as parameters
f9cc43ea cmake: remove unnused member Verbose
6e658085 cmake: Fix constness of methods
87ffd76d cmake: Make internal method file static
fa169fe8 Parser: Merge identical conditions
 2016-06-09 09:18:23 -04:00
Brad King 01632c2552 Merge topic 'xmlwriter' 
e9da5192 CPack/PackageMaker: port to cmXMLWriter
 2016-06-09 09:18:21 -04:00
Brad King 5aa89a1ae0 Merge topic 'java-export-targets' 
0bd91ad4 UseJava: Fix race condition creating java class list
89df91b9 Help: Add notes for topic 'java-export-targets'
95d84369 Tests: Add test for exported JARs
5341c0d8 UseJava: Add infrastructure to export targets
d91ec044 Tests/Java: Clean up style of Java test code
 2016-06-09 09:18:17 -04:00
Daniel Pfeifer e9da5192e5 CPack/PackageMaker: port to cmXMLWriter 2016-06-09 09:16:34 -04:00
Matthew Woehlke 0bd91ad405 UseJava: Fix race condition creating java class list 
Modify logic to unconditionally create an empty class list response file
to instead only create the empty file if no classes are being compiled.
Otherwise, the response file is created via a custom command that
generates the correct list.

This fixes a race condition on certain systems (e.g. HFS on OS X) where
the dependency for creating the "correct" list can have the "same" (due
to limited precision of the filesystem) timestamp as the empty file
created at configure time, resulting in an empty class list being
incorrectly used to invoke `jar` (resulting in `jar` being unhappy that
it was not given any input files). Although one would have some hope
that this doesn't affect "real" projects, it definitely does affect the
JavaExportImport unit test, causing the same to fail randomly when run
on an HFS partition.
 2016-06-09 09:12:15 -04:00
Brad King ceebac93f6 Tests: Restore fix to Plugin test on Watcom compiler 
The fix in commit v3.4.0-rc1~127^2 (Tests: Fix Plugin test on Watcom
compiler, 2015-09-03) was reverted accidentally by automated .c_str()
removal.  Restore it and add a comment explaining why.
 2016-06-09 09:11:10 -04:00
Stuart Mentzer 746a424573 FindFreetype: Factor out common find command arguments 2016-06-09 08:55:24 -04:00
Vladimír Vondruš e937b4c387 FindOpenSSL: Do not assume that the version regex finds something 
BoringSSL's openslv.h does not have the version information.
 2016-06-09 08:51:01 -04:00
Kitware Robot 3969994758 CMake Nightly Date Stamp 2016-06-09 00:01:07 -04:00
Daniel Pfeifer 9f25fc4dbb Prefer std::ostream& over derivatives as parameters 2016-06-08 23:08:40 +02:00
Daniel Pfeifer f9cc43ea37 cmake: remove unnused member Verbose 2016-06-08 23:08:33 +02:00
Stephen Kelly 6e65808516 cmake: Fix constness of methods 2016-06-08 23:08:29 +02:00
Stephen Kelly 87ffd76d1a cmake: Make internal method file static 2016-06-08 23:08:24 +02:00
Stephen Kelly fa169fe8a7 Parser: Merge identical conditions 2016-06-08 23:08:14 +02:00
Tobias Hunger de4ee088e7 cmCommonTargetGenerator: De-duplicate CMAKE_BUILD_TYPE lookup 2016-06-08 16:41:41 -04:00
Tobias Hunger b0d3e693f1 cmLocalGenerator: Pass configuration to GetTargetFlags 
Move the configuration lookup to call sites.  This will allow
multi-configuration callers to use the method.
 2016-06-08 16:18:31 -04:00
Brad King ba92e11f8b Merge topic 'add-FindVulkan' 
b8a00b67 Tests/FindVulkan: Run clang-format
 2016-06-08 12:57:44 -04:00
Brad King b8a00b6721 Tests/FindVulkan: Run clang-format 2016-06-08 12:56:50 -04:00
Brad King c3ba3a40a1 Merge topic 'fix-libarchive-openssl-no-hashes' 
dbc9f73d libarchive: Restore OpenSSL include directory from upstream
 2016-06-08 12:56:10 -04:00
Brad King fb8b8dd106 Merge topic 'add-FindVulkan' 
adf4df28 Add FindVulkan.cmake.
 2016-06-08 12:56:07 -04:00
Brad King 5804068c22 Merge topic 'doc-ctest_update' 
1b18180e Help: Document CTest Git fetch-and-reset behavior
558e4d1e Help: Document ctest_update branch following behavior
 2016-06-08 12:56:05 -04:00
Brad King 5a13dc0b6e Merge topic 'bzip2-debug-names' 
132b8989 FindBZip2: Search for additional bz2d debug library name
 2016-06-08 12:56:02 -04:00
Brad King 8632251b25 Merge topic 'find_path-in-framework' 
188baef0 find_path: Fix location of <dir/header.h> in a framework on OS X
 2016-06-08 12:56:00 -04:00
Brad King 5572f5fffd Merge topic 'clang-format-again' 
ff08a80a Source/CPack: Run clang-format to fix style
3b284432 Tests/FindOpenCL: Run clang-format to fix style
 2016-06-08 12:55:58 -04:00
Matthäus G. Chajdas adf4df28ca Add FindVulkan.cmake. 
This adds FindVulkan with corresponding tests.
 2016-06-08 12:44:03 -04:00
Brad King ea59867187 Run ranlib on archives only if the tool is available 
CMakeFindBinUtils sets CMAKE_RANLIB to `:` if it is not available in
order to get a no-op.  This does not work on a Windows host build
environment that runs commands in `cmd` instead of `sh`.  Teach the
Ninja and Makefile generators to simply skip the command if it is `:`.

This this was already done by the Makefile generator since commit
v2.6.0~3161 (BUG: Do not write link script lines that use the ':',
2006-06-18), but only when using a link script.

Reported-by: Michael Jäntsch <Michael.Jaentsch@gmx.de>
 2016-06-08 12:00:44 -04:00
Brad King b55039ce5b Merge branch 'doc-ctest_update' into release 2016-06-08 10:03:41 -04:00
Brad King 1b18180ed4 Help: Document CTest Git fetch-and-reset behavior 2016-06-08 09:58:43 -04:00
Brad King 558e4d1ed6 Help: Document ctest_update branch following behavior 2016-06-08 09:53:13 -04:00