summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge topic 'autorcc-only-no-rebuild'Brad King2016-11-101-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | e4232b82 QtAutogen: Do not re-generate AUTORCC outputs on every build
| * | | | | | | QtAutogen: Do not re-generate AUTORCC outputs on every buildBrad King2016-11-091-2/+2
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | CMake Nightly Date StampKitware Robot2016-11-101-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'update-kwsys'Brad King2016-11-0972-13666/+11539
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95a97a40 Merge branch 'upstream-KWSys' into update-kwsys 773b36e5 KWSys 2016-11-09 (18c65411)
| * \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-11-0972-13666/+11539
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-11-09 (18c65411)
| | * | | | | KWSys 2016-11-09 (18c65411)KWSys Upstream2016-11-0973-13666/+11541
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge topic 'drop-kwstyle'Brad King2016-11-097-140/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36f9f0f8 Drop KWStyle checks in favor of clang-format and Git hooks
| * | | | | | | Drop KWStyle checks in favor of clang-format and Git hooksBrad King2016-11-087-140/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge topic 'FindSDL_preventGrowingCacheVar'Brad King2016-11-091-2/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f18b18b7 FindSDL: Prevent unbounded growth of SDL_LIBRARY_TEMP variable
| * | | | | | | FindSDL: Prevent unbounded growth of SDL_LIBRARY_TEMP variableCraig Scott2016-11-081-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge topic 'pkgconfig_imported_target'Brad King2016-11-091-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | 61898de6 PkgConfig: Fix FindPkgConfig imported target feature
| * | | | | | | PkgConfig: Fix FindPkgConfig imported target featureFlorent Castelli2016-11-041-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge topic 'imported-interface-libname'Brad King2016-11-0924-21/+294
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Allow imported INTERFACE libraries to specify a link library nameBrad King2016-11-0924-15/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | cmTarget: Refactor GetMappedConfig to choose location property up frontBrad King2016-11-031-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the `IMPORTED_LOCATION` property name in a variable up front to avoid duplicating the string literal.
| * | | | | | | cmTarget: Add comment clarifying interface library special caseBrad King2016-11-031-0/+2
| | | | | | | |
| * | | | | | | cmTarget: Clarify comments in GetMappedConfigBrad King2016-11-031-3/+3
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Clarify comments explaining the availability of a target location (file on disk) to distinguish this from the existence of the target.
* | | | | | | CMake Nightly Date StampKitware Robot2016-11-091-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'include-what-you-use'Brad King2016-11-08140-442/+660
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e620f0b Fix several include-what-you-use findings
| * | | | | | Fix several include-what-you-use findingsDaniel Pfeifer2016-11-08140-442/+660
| | | | | | |
* | | | | | | Merge topic 'clang-tidy'Brad King2016-11-084-8/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | cmGeneratorTarget: Correctly set FortranModuleDirectoryCreatedDaniel Pfeifer2016-11-051-0/+1
| | | | | | | |
| * | | | | | | cmGeneratorTarget: Don't assing a bool to a stringDaniel Pfeifer2016-11-051-1/+0
| | | | | | | |
| * | | | | | | cmGlobalNinjaGenerator: Suppress clang-tidy warningDaniel Pfeifer2016-11-051-2/+2
| | | | | | | |
| * | | | | | | cmCTestSubmitHandler: Remove redundant c_str()Daniel Pfeifer2016-11-051-1/+1
| | | | | | | |
| * | | | | | | cmCPluginAPI: Fix clang-tidy findingsDaniel Pfeifer2016-11-051-4/+4
| |/ / / / / /
* | | | | | | Merge topic 'cpack-rpm-omit-unsupported-tags'Brad King2016-11-086-0/+73
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Release text for omitting unsupported tags topicDomen Vrankar2016-11-051-0/+8
| | | | | | | |
| * | | | | | | CPack/RPM test for Suggests tagAlexander Adam2016-11-054-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | CPack/RPM prevent special tags from being removedDomen Vrankar2016-11-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tags are not listed by rpmbuild querytags even though they are supported. Ignore those tags during the removal of unsupported tags.
| * | | | | | | CPack/RPM omit unsupported tagsAlexander Adam2016-11-051-0/+20
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Omit tags that are not supported by provided rpmbuild as some tags get added/removed in later versions of the tool. Closes: #13423
* | | | | | | Merge topic 'FortranCInterface-pic'Brad King2016-11-081-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80e47723 FortranCInterface: Make mangling detection robust to PIC Fortran
| * | | | | | | FortranCInterface: Make mangling detection robust to PIC FortranBrad King2016-11-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | CMake Nightly Date StampKitware Robot2016-11-081-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2016-11-071-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2016-11-061-1/+1
| |/ / / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-11-051-1/+1
|/ / / / /
* | | | | Merge branch 'release'Brad King2016-11-040-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | CMake 3.7.0-rc3v3.7.0-rc3Brad King2016-11-041-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2016-11-040-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'cpackifw-search-algorithm' into releaseBrad King2016-11-031-21/+47
| |\ \ \ \
* | \ \ \ \ Merge topic 'vs-flag-order'Brad King2016-11-042-2/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cb5d335 VS: Place source-specific AdditionalOptions after target-wide flags
| * | | | | | VS: Place source-specific AdditionalOptions after target-wide flagsBrad King2016-11-022-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flags specified in the `COMPILE_FLAGS` source-file property should be placed after those in target-wide properties so that those on individual source files can override those on the whole target. This is already done by most generators but was not implemented correctly for VS 2010 and above. Closes: #16400
* | | | | | | Merge topic 'cpackifw-search-algorithm'Brad King2016-11-041-21/+47
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | 20cc76c9 CPackIFW: Update search to find QtIFW distributed with QtSDK
| * | | | | | CPackIFW: Update search to find QtIFW distributed with QtSDKKonstantin Podsvirov2016-11-031-21/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also avoid CMP0007 warnings.
* | | | | | | CMake Nightly Date StampKitware Robot2016-11-041-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'release-3.6'Brad King2016-11-030-0/+0
|\ \ \ \ \ \
| * | | | | | CMake 3.6.3v3.6.3Brad King2016-11-021-1/+1
| | | | | | |
* | | | | | | Merge branch 'release'Brad King2016-11-030-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'FindHDF5-restore-default-C' into releaseBrad King2016-11-021-10/+2
| |\ \ \ \ \ \