Commit Graph

33720 Commits

Author SHA1 Message Date
Brad King 25a76df17f Merge topic 'autorcc-only-no-rebuild'
e4232b82 QtAutogen: Do not re-generate AUTORCC outputs on every build
2016-11-10 08:34:22 -05:00
Kitware Robot 7c09bcfee8 CMake Nightly Date Stamp 2016-11-10 00:01:04 -05:00
Brad King e4232b82e6 QtAutogen: Do not re-generate AUTORCC outputs on every build
Refactoring in commit v3.6.0-rc1~134^2~10 (Autogen: Split out moc file
generation code to dedicated method, 2016-04-18) removed the
unconditional creation of the `<target>_automoc.cpp` file.  Now it is
generated only when `AUTOMOC` is enabled.  However, if this file is not
created then our internal `GenerateAll` setting is enabled on every
build, causing `AUTORCC` to re-generate its file(s) every time.  Fix the
`GenerateAll` setting to be used only for when autogen settings change.
The old logic was left from when we had only automoc.

Closes: #16413
2016-11-09 11:22:07 -05:00
Brad King 88f38a2bb4 Merge topic 'update-kwsys'
95a97a40 Merge branch 'upstream-KWSys' into update-kwsys
773b36e5 KWSys 2016-11-09 (18c65411)
2016-11-09 09:50:01 -05:00
Brad King 64b5b06dc6 Merge topic 'drop-kwstyle'
36f9f0f8 Drop KWStyle checks in favor of clang-format and Git hooks
2016-11-09 09:49:58 -05:00
Brad King e2565be52c Merge topic 'FindSDL_preventGrowingCacheVar'
f18b18b7 FindSDL: Prevent unbounded growth of SDL_LIBRARY_TEMP variable
2016-11-09 09:49:56 -05:00
Brad King 72190b923b Merge topic 'pkgconfig_imported_target'
61898de6 PkgConfig: Fix FindPkgConfig imported target feature
2016-11-09 09:49:53 -05:00
Brad King 453df662ba Merge topic 'imported-interface-libname'
09cda9d5 Allow imported INTERFACE libraries to specify a link library name
1d1f1eeb cmTarget: Refactor GetMappedConfig to choose location property up front
479932fa cmTarget: Add comment clarifying interface library special case
925e4270 cmTarget: Clarify comments in GetMappedConfig
2016-11-09 09:49:49 -05:00
Brad King 09cda9d5e7 Allow imported INTERFACE libraries to specify a link library name
Add an `IMPORTED_LIBNAME[_<CONFIG>]` target property to specify a library
name to be placed on the link line in place of an interface library
since it has no library file of its own.  Restrict use of the property
to imported `INTERFACE` libraries.

This will be particularly useful for find modules that need to provide
imported libraries from system SDKs where the full path to the library
file is not known.  Now such find modules will be able to provide an
imported interface library and set `IMPORTED_LIBNAME` to refer to the
SDK library by name.

Issue: #15267
2016-11-09 09:45:14 -05:00
Brad King 95a97a40e4 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2016-11-09 (18c65411)
2016-11-09 09:23:18 -05:00
KWSys Upstream 773b36e5d4 KWSys 2016-11-09 (18c65411)
Code extracted from:

    http://public.kitware.com/KWSys.git

at commit 18c654114de3aa65429542f95308720bc68f9231 (master).

Upstream Shortlog
-----------------

Brad King (14):
      37306a1c FStream: Quiet unused argument warning
      15e90a3c Sort includes to stabilize include order w.r.t. clang-format
      26509227 Copyright.txt: Add notice of copyright by contributors
      fc42d3f2 Add temporary script to filter license notices
      c41c1bc4 Simplify KWSys per-source license notices
      1d4c0b4a Remove temporary script that filtered license notices
      a4f5ef79 SystemInformation: Remove stray comment
      8649a886 kwsysPrivate: Protect KWSYS_HEADER macro from clang-format
      89b98af5 Configure clang-format for KWSys source tree
      547dacad Add a script to run clang-format on the entire source tree
      aa94be0c CONTRIBUTING: Add a section on coding style
      6604c4b6 Empty commit at end of history preceding clang-format style transition
      2b3e2b1c Tell Git to not export 'clang-format' infrastructure
      18c65411 FStream: Include Configure.hxx before other headers

Kitware Robot (1):
      6c973b46 Revise C++ coding style using clang-format
2016-11-09 09:22:56 -05:00
Kitware Robot 25085f41b2 CMake Nightly Date Stamp 2016-11-09 00:01:04 -05:00
Brad King 36f9f0f8a3 Drop KWStyle checks in favor of clang-format and Git hooks
We now define code layout by clang-format and enforce whitespace with
Git hooks.  There is no need to run KWStyle anymore, as all we used it
to check was line length anyway.
2016-11-08 11:40:20 -05:00
Craig Scott f18b18b72b FindSDL: Prevent unbounded growth of SDL_LIBRARY_TEMP variable
Just modify the cache var property rather than using set() to hide it.
Otherwise the set() includes other values added to the temporary list.

Closes: #16406
2016-11-08 09:52:55 -05:00
Brad King 666bb0e3fa Merge topic 'include-what-you-use'
2e620f0b Fix several include-what-you-use findings
2016-11-08 09:44:40 -05:00
Brad King 4ec359bd62 Merge topic 'clang-tidy'
0cd654c8 cmGeneratorTarget: Correctly set FortranModuleDirectoryCreated
bac93dcf cmGeneratorTarget: Don't assing a bool to a string
1e994985 cmGlobalNinjaGenerator: Suppress clang-tidy warning
5ae3966d cmCTestSubmitHandler: Remove redundant c_str()
443180fb cmCPluginAPI: Fix clang-tidy findings
2016-11-08 09:44:37 -05:00
Brad King 049b10e2f6 Merge topic 'cpack-rpm-omit-unsupported-tags'
b34c0457 Release text for omitting unsupported tags topic
cd042330 CPack/RPM test for Suggests tag
228280d8 CPack/RPM prevent special tags from being removed
d8e83ab9 CPack/RPM omit unsupported tags
2016-11-08 09:44:34 -05:00
Brad King 69bb9f37f9 Merge topic 'FortranCInterface-pic'
80e47723 FortranCInterface: Make mangling detection robust to PIC Fortran
2016-11-08 09:44:31 -05:00
Daniel Pfeifer 2e620f0b38 Fix several include-what-you-use findings 2016-11-08 09:42:04 -05:00
Kitware Robot 48910cf096 CMake Nightly Date Stamp 2016-11-08 00:01:03 -05:00
Kitware Robot 9df1cb0fa6 CMake Nightly Date Stamp 2016-11-07 00:01:03 -05:00
Kitware Robot d568cecf38 CMake Nightly Date Stamp 2016-11-06 00:01:05 -04:00
Daniel Pfeifer 0cd654c8e2 cmGeneratorTarget: Correctly set FortranModuleDirectoryCreated 2016-11-06 00:11:03 +01:00
Daniel Pfeifer bac93dcf19 cmGeneratorTarget: Don't assing a bool to a string 2016-11-05 23:54:57 +01:00
Daniel Pfeifer 1e994985d8 cmGlobalNinjaGenerator: Suppress clang-tidy warning 2016-11-05 23:51:30 +01:00
Daniel Pfeifer 5ae3966d75 cmCTestSubmitHandler: Remove redundant c_str() 2016-11-05 23:46:24 +01:00
Daniel Pfeifer 443180fb99 cmCPluginAPI: Fix clang-tidy findings 2016-11-05 23:44:29 +01:00
Domen Vrankar b34c045736 Release text for omitting unsupported tags topic 2016-11-05 11:53:30 +01:00
Alexander Adam cd0423300b CPack/RPM test for Suggests tag
Suggests tag was not present in older versions
of rpmbuild so we test that the rpm package is
always generated either with Suggests tag present
or skipped if not supported.
2016-11-05 11:44:32 +01:00
Domen Vrankar 228280d833 CPack/RPM prevent special tags from being removed
Some tags are not listed by rpmbuild querytags
even though they are supported. Ignore those
tags during the removal of unsupported tags.
2016-11-05 11:44:32 +01:00
Alexander Adam d8e83ab979 CPack/RPM omit unsupported tags
Omit tags that are not supported by provided rpmbuild
as some tags get added/removed in later versions of
the tool.

Closes: #13423
2016-11-05 11:42:08 +01:00
Kitware Robot f52bcc2ac1 CMake Nightly Date Stamp 2016-11-05 00:01:04 -04:00
Florent Castelli 61898de641 PkgConfig: Fix FindPkgConfig imported target feature
The options to the find_library call to create the imported target
used a literal string "HINTS /path NO_DEFAULT_PATH" instead of a
list of options. This resulted in never finding any library in my
testing.
2016-11-04 23:35:27 +01:00
Brad King 80e477239d FortranCInterface: Make mangling detection robust to PIC Fortran
When using a Fortran compiler that produces PIC executables by default
with a C compiler that does not produce PIC by default then the mangling
detection executable fails to link.  Explicitly enable PIC for the C
compiler just in case the Fortran compiler needs it to link.

Issue: #16405
2016-11-04 09:54:12 -04:00
Brad King 800a11dc36 Merge branch 'release' 2016-11-04 09:44:12 -04:00
Brad King adf5f253ec CMake 3.7.0-rc3 v3.7.0-rc3 2016-11-04 08:30:22 -04:00
Brad King 7c0e67ee22 Merge branch 'release' 2016-11-04 08:27:51 -04:00
Brad King 926a22b8b8 Merge topic 'vs-flag-order'
4cb5d335 VS: Place source-specific AdditionalOptions after target-wide flags
2016-11-04 08:26:09 -04:00
Brad King 28a9e71c52 Merge topic 'cpackifw-search-algorithm'
20cc76c9 CPackIFW: Update search to find QtIFW distributed with QtSDK
2016-11-04 08:26:05 -04:00
Kitware Robot d6ef59f5a3 CMake Nightly Date Stamp 2016-11-04 00:01:11 -04:00
Brad King 1d1f1eeb6a cmTarget: Refactor GetMappedConfig to choose location property up front
Store the `IMPORTED_LOCATION` property name in a variable up front
to avoid duplicating the string literal.
2016-11-03 16:10:35 -04:00
Brad King 479932fa32 cmTarget: Add comment clarifying interface library special case 2016-11-03 16:02:49 -04:00
Brad King 925e4270fd cmTarget: Clarify comments in GetMappedConfig
Clarify comments explaining the availability of a target location
(file on disk) to distinguish this from the existence of the target.
2016-11-03 14:53:35 -04:00
Brad King 60d80bca4a Merge branch 'release-3.6' 2016-11-03 10:42:24 -04:00
Brad King 8b75290f13 Merge branch 'cpackifw-search-algorithm' into release 2016-11-03 09:30:29 -04:00
Konstantin Podsvirov 20cc76c93a CPackIFW: Update search to find QtIFW distributed with QtSDK
Also avoid CMP0007 warnings.
2016-11-03 09:28:15 -04:00
Brad King dec0cfcef0 Merge branch 'release' 2016-11-03 08:58:27 -04:00
Brad King a12e148b8a Merge branch 'release-3.6' 2016-11-03 08:56:28 -04:00
Brad King acc2e03d79 Merge topic 'FindHDF5-restore-default-C'
ff3ccc1f FindHDF5: Restore pre-3.6 behavior of finding only C by default
2016-11-03 08:54:43 -04:00
Brad King 3dd99758d1 Merge topic 'remove-utf8-option'
baead1e2 Encoding: Remove option to use ANSI code page internally
2016-11-03 08:54:37 -04:00