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
Kitware Robot
1cfc750150
CMake Nightly Date Stamp
2016-06-08 00:01:07 -04:00
Roger Leigh
132b898968
FindBZip2: Search for additional bz2d debug library name
2016-06-07 22:46:40 +01:00
Brad King
b86585d89a
Merge branch 'release'
2016-06-07 15:16:09 -04:00
Brad King
fb30b1a282
Merge branch 'fix-libarchive-openssl-no-hashes' into release
2016-06-07 15:08:14 -04:00
Brad King
dbc9f73d0e
libarchive: Restore OpenSSL include directory from upstream
...
In commit v3.6.0-rc1~100^2 (libarchive: Drop early use of crypto
library, 2016-05-03) we accidentally dropped the include directory for
OpenSSL as well as the library. Without that, it works only
accidentally when CHECK_CRYPTO happens to choose the OpenSSL
implementation and add the include directory.
Reported-by: Bradley Lowekamp <blowekamp@mail.nih.gov>
2016-06-07 15:05:11 -04:00
Harry Mallon
188baef00c
find_path: Fix location of <dir/header.h> in a framework on OS X
...
After finding it in `foo.Framework/Headers/dir/header.h`, we should
report the `foo.Framework/Headers` directory, not
`foo.Framework/Headers/dir`, because the former is what actually
contains the path the caller wishes to include.
2016-06-07 09:04:35 -04:00
Brad King
89df91b938
Help: Add notes for topic 'java-export-targets'
2016-06-07 08:50:36 -04:00
Matthew Woehlke
95d84369b8
Tests: Add test for exported JARs
...
Add a unit test to test the new functions to export JAR targets. The
test builds three sub-projects: two that generate and export a JAR (one
does a build-directory-only export, one an install-only export), and a
third that consumes the first two as imported targets.
2016-06-07 08:50:36 -04:00
Matthew Woehlke
5341c0d84a
UseJava: Add infrastructure to export targets
...
Add additional functions to UseJava.cmake to create "exported" targets,
similar to those of C/C++ libraries. In support of this, ensure that the
JAR_FILE property of jar targets is always an absolute path.
2016-06-07 08:50:35 -04:00
Matthew Woehlke
d91ec04402
Tests/Java: Clean up style of Java test code
2016-06-07 08:50:35 -04:00
Brad King
ff08a80af1
Source/CPack: Run clang-format to fix style
2016-06-07 08:41:16 -04:00
Brad King
3b2844328c
Tests/FindOpenCL: Run clang-format to fix style
2016-06-07 08:41:06 -04:00
Brad King
eeac8430bf
Merge topic 'update-expat'
...
182f6458
Merge branch 'upstream-expat' into update-expat
eb831123
expat 2016-06-05 (2b9cb7f5)
2016-06-07 08:34:09 -04:00
Brad King
9b15a15fe9
Merge topic 'SunOS-PathScale'
...
fcfe121f
Platform: add flag definitions for PathScale compiler on SunOS (#16135 )
2016-06-07 08:34:07 -04:00
Brad King
633d99dc62
Merge topic 'remove-c_str'
...
fa277b29
Remove c_str() calls from stream arguments.
ba5fb165
call static cmOutputConverter::GetFortranFormat without object
2016-06-07 08:34:04 -04:00
Kitware Robot
14de21d7d2
CMake Nightly Date Stamp
2016-06-07 00:01:07 -04:00
Daniel Pfeifer
fa277b29e4
Remove c_str() calls from stream arguments.
...
Mostly automated:
git grep -l '.c_str() <<' | xargs sed -i 's|\.c_str() <<| <<|g'
2016-06-06 23:53:32 +02:00
Daniel Pfeifer
ba5fb16519
call static cmOutputConverter::GetFortranFormat without object
2016-06-06 23:32:38 +02:00
Brad King
d546456765
Merge topic 'productbuild'
...
63e5eb5f
Help: Add notes for 'productbuild' topic
2e3c67d1
productbuild: Add new productbuild cpack generator.
50a3d340
PackageMaker: factor out common code for creating pkg files.
2016-06-06 11:19:20 -04:00
Brad King
63e5eb5fd3
Help: Add notes for 'productbuild' topic
2016-06-06 09:25:39 -04:00
Brad King
c3b268e40d
Merge topic 'FindBoost-vs-prebuilt'
...
c3a281fd
FindBoost: Search in official Windows prebuilt binary library directory
3720d5f4
FindBoost: Test `CMAKE_CXX_COMPILER_{ID,VERSION}` instead of `MSVC*`
2016-06-06 09:20:07 -04:00
Brad King
ab7d649fae
Merge topic 'FindLibArchive-3.2'
...
38d18bab
FindLibArchive: Support libarchive 3.2 version string format
2016-06-06 09:20:03 -04:00
Brad King
cd1f0a824e
Merge branch 'update-expat' into release
2016-06-06 09:10:48 -04:00
Brad King
182f645801
Merge branch 'upstream-expat' into update-expat
...
* upstream-expat:
expat 2016-06-05 (2b9cb7f5)
2016-06-06 09:08:33 -04:00
Expat Upstream
eb83112347
expat 2016-06-05 (2b9cb7f5)
...
Code extracted from:
http://git.code.sf.net/p/expat/code_git
at commit 2b9cb7f5b59397d2d04117a419cd3d9d50f4a1ed (master).
2016-06-06 09:08:21 -04:00
Brad King
cd1327bb9c
Merge branch 'SunOS-PathScale' into release
2016-06-06 09:01:00 -04:00
Michał Górny
fcfe121fd8
Platform: add flag definitions for PathScale compiler on SunOS ( #16135 )
2016-06-06 08:58:20 -04:00
Kitware Robot
fc45ecfc50
CMake Nightly Date Stamp
2016-06-06 00:01:05 -04:00
Kitware Robot
1503a67bf4
CMake Nightly Date Stamp
2016-06-05 00:01:05 -04:00
Kitware Robot
6a22a7cf71
CMake Nightly Date Stamp
2016-06-04 00:01:05 -04:00
Clinton Stimpson
2e3c67d1b6
productbuild: Add new productbuild cpack generator.
...
This cpack generator basically replaces the obsolete PackageMaker generator.
2016-06-03 14:41:57 -06:00
Brad King
236b7cbe6e
Merge branch 'FindLibArchive-3.2' into release
2016-06-03 13:27:34 -04:00
Orion Poplawski
38d18bab54
FindLibArchive: Support libarchive 3.2 version string format
2016-06-03 13:18:03 -04:00
Alex Turbov
c3a281fd32
FindBoost: Search in official Windows prebuilt binary library directory
...
Avoid the need to specify `BOOST_LIBRARYDIR` along with `BOOST_ROOT`
when using prebuilt binaries such as these:
https://sourceforge.net/projects/boost/files/boost-binaries/
2016-06-03 11:15:02 -04:00
Alex Turbov
3720d5f4a3
FindBoost: Test `CMAKE_CXX_COMPILER_{ID,VERSION}` instead of `MSVC*`
2016-06-03 11:11:38 -04:00
Brad King
cf12e4abcd
Merge branch 'release'
2016-06-03 10:50:25 -04:00
Brad King
0663dbf133
Merge topic 'minor-cleanups'
...
f6c21894
Modules: Rename internal platform-specific compiler determination modules
0c7951a9
cmLocalGenerator: Consolidate conditions in AddArchitectureFlags
2016-06-03 10:45:59 -04:00
Brad King
9d16f64048
Merge topic 'fix-TARGET_PROPERTY-LOCATION-crash'
...
f500a784
Fix crash on $<TARGET_PROPERTY:...,LOCATION> genex (#16134 )
2016-06-03 10:45:57 -04:00
Brad King
2f1d82bd7b
Merge topic 'cpack-nsis-remove-duplicate-include'
...
e847b6c8
CPack/NSIS: Remove duplicate include from NSIS.template.in (#16132 )
2016-06-03 10:45:54 -04:00
Brad King
3d6638471a
Merge topic 'size-empty'
...
c6220de2
Use the empty() method to check for emptyness.
2016-06-03 10:45:52 -04:00
Brad King
e3f7637659
Merge topic 'FindOpenCL-imported-target'
...
b66d4739
FindOpenCL: Add an imported target
2016-06-03 10:45:48 -04:00
Brad King
4b7834467c
Merge topic 'compiler-id-with-bracket-in-path'
...
a7d1c4ec
CMakeDetermineCompilerId: Fix compiler id with square brackets in the path
2016-06-03 10:45:46 -04:00
Brad King
6f1f7965af
Merge topic 'fix-ti-link-order'
...
89317915
Compiler/TI: Pass libraries as last part to linker
2016-06-03 10:45:43 -04:00
Brad King
811831a958
Merge topic 'simplify-boolean-expressions'
...
7f6b8d33
Simplify boolean expressions
2016-06-03 10:45:40 -04:00
Kitware Robot
8b289db739
CMake Nightly Date Stamp
2016-06-03 00:01:19 -04:00