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
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
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
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
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