Commit Graph

32081 Commits

Author SHA1 Message Date
Brad King e6bc818deb Merge topic 'GetPrerequisites-typo'
49a07d7a Merge branch 'backport-GetPrerequisites-typo' into GetPrerequisites-typo
8b3ffbe4 GetPrerequisites: fix typo in comment
460a589d GetPrerequisites: fix typo in comment
2016-06-27 10:40:26 -04:00
Daniel Pfeifer 7647f6afa4 Add CM_OVERRIDE to some functions
Run clang-tidy's modernize-use-override checker.  This checker must have
issues in version 3.8.  It has way too little matches.  And it adds
override to destructors.  Revert the changes on the destructors and
change override to CM_OVERRIDE.
2016-06-27 10:37:41 -04:00
Daniel Pfeifer 5286110d6f cxx features: add check for override 2016-06-27 10:37:41 -04:00
Daniel Pfeifer 09aa2c9418 Use <unordered_set> where available 2016-06-27 10:37:40 -04:00
Daniel Pfeifer ea5477e43d Make C++ feature checks extensible
Turn the feature check for cxx11_unordered_map into a function such that
we can use it for other features as well.  Drop the 11 suffix, as we may
want to check features from other standards.
2016-06-27 10:37:40 -04:00
Brad King cd29388615 Merge branch 'FindHDF5-handle-unsuffixed' into release 2016-06-27 10:29:09 -04:00
Kitware Robot 99c873c835 CMake Nightly Date Stamp 2016-06-27 00:01:04 -04:00
Gregor Jasny 2ca76a6651 Validate target name in ALIASED_TARGET property getter 2016-06-26 22:00:00 +02:00
Kitware Robot c68cf9e4d1 CMake Nightly Date Stamp 2016-06-26 00:01:05 -04:00
Ruslan Baratov 11c3a8dc11 CMakeIOSInstallCombined: add some sanity checks 2016-06-25 13:48:31 +02:00
Ruslan Baratov aff1e77f48 CMakeIOSInstallCombined: do not merge content of OUTPUT and ERROR variables 2016-06-25 13:37:44 +02:00
Kitware Robot 3a0449439f CMake Nightly Date Stamp 2016-06-25 00:01:05 -04:00
Robert Maynard 234deec2ea FindHDF5: create all the *_LIBRARIES when using hdf5-config.cmake 2016-06-24 15:28:23 -04:00
Robert Maynard 963b576fd2 FindHDF5: cache the correct path to the high level libraries 2016-06-24 15:26:22 -04:00
Kitware Robot f05657de9d CMake Nightly Date Stamp 2016-06-24 00:01:08 -04:00
Florent Castelli 8bbd5db4c1 Ninja: Make bundle resources a dependency of their target
Fixes #13816.
2016-06-23 15:50:03 -04:00
Brad King 24bad96ec0 Merge branch 'doc-osx-versions' into release 2016-06-23 13:47:08 -04:00
Bartosz Kosiorek 00caa1dde8 Help: Describe VERSION and SOVERSION meanings for Mach-O binaries 2016-06-23 13:44:26 -04:00
Robert Maynard 9f2728cef3 FindHDF5: When component targets not found fallback to compiler wrappers 2016-06-23 12:31:26 -04:00
Robert Maynard 149539d9c2 FindHDF5: Handle HDF5 builds with non-suffixed components 2016-06-23 10:57:58 -04:00
Robert Maynard f30b0fec74 FindHDF5: correctly add lang to each component target name. 2016-06-23 10:56:29 -04:00
Brad King c2c2a2f4c7 Merge topic 'vs-tool-override'
ed05f11d VS: Add a VS_TOOL_OVERRIDE source file property
2016-06-23 08:59:29 -04:00
Brad King 015876fa81 Merge topic 'vs-sdk-refs'
35a6cac2 VS: Add VS_SDK_REFERENCES target property to reference external SDKs
2016-06-23 08:59:26 -04:00
Brad King f101d4eff3 Merge topic 'xcode-bundle-extension'
e36e5a26 Xcode: Properly handle BUNDLE_EXTENSION
2016-06-23 08:59:23 -04:00
Brad King 0acf9cb8d1 Merge branch 'backport-GetPrerequisites-typo' into release 2016-06-23 08:56:23 -04:00
Brad King 49a07d7a14 Merge branch 'backport-GetPrerequisites-typo' into GetPrerequisites-typo 2016-06-23 08:55:38 -04:00
Rolf Eike Beer 8b3ffbe4af GetPrerequisites: fix typo in comment 2016-06-23 08:55:07 -04:00
Kitware Robot 46f49c918a CMake Nightly Date Stamp 2016-06-23 00:01:15 -04:00
Rolf Eike Beer 460a589d20 GetPrerequisites: fix typo in comment 2016-06-22 21:38:08 +02:00
Brad King 68bb74d9e6 Merge branch 'release' 2016-06-22 13:18:48 -04:00
Brad King d152ae123d CMake 3.6.0-rc3 2016-06-22 09:02:00 -04:00
Brad King 4561816b64 Merge branch 'release' 2016-06-22 08:54:24 -04:00
Brad King 54e293db06 Merge topic 'FindZLIB-fixup'
4bb83514 FindZLIB: Do not mark unused variable as advanced
2016-06-22 08:53:04 -04:00
Brad King ed59f4ba67 Merge topic 'GetPrerequisites-findstr'
867b73e2 GetPrerequisites: Optimize on Windows by filtering `objdump` output
2016-06-22 08:53:02 -04:00
Brad King 110270fbb6 Merge topic 'doc-VS_STARTUP_PROJECT-clarify'
d3e538ea Help: Clarify VS_STARTUP_PROJECT documentation
2016-06-22 08:53:00 -04:00
Gilles Khouzam 35a6cac2d3 VS: Add VS_SDK_REFERENCES target property to reference external SDKs
Allow one to specify external SDK references such as
`Microsoft.AdMediatorWindows81, Version=1.0`.
2016-06-22 08:34:12 -04:00
Kitware Robot de943c3128 CMake Nightly Date Stamp 2016-06-22 00:01:10 -04:00
Brad King f65b2753d3 Merge branch 'release' 2016-06-21 14:01:12 -04:00
Brad King 8380f47cc9 Merge topic 'output-converter'
8ddbd4c2 cmOutputConverter: remove unnecessary conversion
bdaadbdc cmOutputConverter: collapse ConvertToOutputForExisting functions
191fc3a0 cmOutputConverter: remove unused 'local' argument
b86007e3 cmOutputConverter: remove 'optional' argument
cde127b0 cmOutputConverter::Convert: invert condition
c23f89bc cmOutputConverter::Convert: make precondition explicit
2016-06-21 13:57:16 -04:00
Brad King cc9f6f3b98 Merge topic '14068-ctest-target-set-buildname-with-only-c-compiler'
6509ad29 CTest: Properly set buildname if only C langage is enabled
2016-06-21 13:57:14 -04:00
Brad King e260f30d23 Merge topic 'FindGLEW-debug'
6087b9e4 FindGLEW: Search for debug and release configurations separately
2016-06-21 13:57:11 -04:00
Brad King 91392a66e1 Merge topic 'FindLua-match-header-and-lib'
eecd307e FindLua: Iterate through all include subdirs to find a suitable header
3532cbce FindLua: Check header file against suitable versions
281c707b FindLua: Factor out a helper function for version extraction
92c67b9f FindLua: Prefix private APIs with `_lua_`
2016-06-21 13:57:09 -04:00
Brad King 9cb685505a Merge topic 'update-libarchive'
52f58267 Merge branch 'upstream-LibArchive' into update-libarchive
2b94d71d LibArchive 2016-06-19 (139d0576)
2016-06-21 13:57:07 -04:00
Brad King 447f0618db Merge topic 'FindBoost-imported-fallback-to-release'
c9fca42f FindBoost: Make imported targets fall back to `Release`
2016-06-21 13:57:04 -04:00
Brad King 736ffc627c Merge topic 'aix-clang'
5cc34162 AIX: Add support for Clang compiler
2016-06-21 13:57:02 -04:00
Brad King b70f18379b Merge topic 'refactor-flags'
41925efe cmGeneratorTarget: Fix Fortran module directory regression
2016-06-21 13:56:59 -04:00
Brad King 41925efe76 cmGeneratorTarget: Fix Fortran module directory regression
Refactoring in commit 49f10f0d (cmGeneratorTarget: Adopt Fortran module
directory generation, 2016-06-10) accidentally made a local variable
declared `static` causing results to be re-used incorrectly.
2016-06-21 13:37:06 -04:00
Brad King c41dfdabdd Merge branch 'doc-VS_STARTUP_PROJECT-clarify' into release 2016-06-21 09:34:47 -04:00
Brad King d3e538eabb Help: Clarify VS_STARTUP_PROJECT documentation
Explain in what directory the property should be set to affect the
corresponding ``.sln`` file.

Suggested-by: Stephen Kelly <steveire@gmail.com>
2016-06-21 09:33:35 -04:00
Brad King 4bb8351414 FindZLIB: Do not mark unused variable as advanced
We no longer define the ZLIB_LIBRARY cache entry, so we should not mark
it as advanced either.  We only use this variable when someone else
defines it in order to remain compatible with older versions of this
module, but we never create the entry ourselves anymore.
2016-06-21 08:56:56 -04:00