summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CPack/RPM: check executable flags for debuginfo packagesDomen Vrankar2017-12-067-9/+94
| | | | | Debuginfo packages can not be created from programs and shared libraries that do not have execute permissions.
* Merge branch 'release-3.10'Brad King2017-12-060-0/+0
|\
| * Merge branch 'findmpi-notfound-spam' into release-3.10Brad King2017-12-051-10/+16
| |\ | | | | | | | | | Merge-request: !1557
| * \ Merge branch 'findmpi-found-cond' into release-3.10Brad King2017-12-051-1/+1
| |\ \ | | | | | | | | | | | | Merge-request: !1556
* | \ \ Merge topic 'doc-lang-order'Brad King2017-12-062-2/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ecd8b60 Help: Document that ASM should be enabled last Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1560
| * | | | Help: Document that ASM should be enabled lastBrad King2017-12-062-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ASM should be enabled after C and/or CXX because we consider the compilers for those languages as possible assemblers. Issue: #17532
* | | | | Merge topic 'src-COMPILE_DEFINITIONS-genex'Brad King2017-12-0616-28/+103
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9432f686 Add generator expression support to per-source COMPILE_DEFINITIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1546
| * | | | | Add generator expression support to per-source COMPILE_DEFINITIONSMarc Chevrier2017-12-0516-28/+103
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This allows users to specify different genex-based compile definitions for each file in a target. Fixes: #17508
* | | | | Merge topic 'update-kwsys'Brad King2017-12-063-146/+274
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79b241de cmake-gui: Update RegexExplorer for changes to KWSys 4a8bbc52 Merge branch 'upstream-KWSys' into update-kwsys 52a5c4a8 KWSys 2017-12-05 (9376537e) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1558
| * | | | | cmake-gui: Update RegexExplorer for changes to KWSysBrad King2017-12-051-2/+2
| | | | | |
| * | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-12-052-144/+272
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-12-05 (9376537e)
| | * | | | KWSys 2017-12-05 (9376537e)KWSys Upstream2017-12-052-144/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 9376537ec0e4770a28f4b1705cfacf79650f71b6 (master). Upstream Shortlog ----------------- Brad King (1): e9557f37 RegularExpression: Fix regression in 'find' method Sebastian Holtermann (4): 4d1e8738 RegularExpression: Make compile() reentrant (thread safe) 64f80068 RegularExpression: Make find() reentrant (thread safe) bbc94ba8 RegularExpression: Remove unused code cff58f07 RegularExpression: New RegularExpressionMatch class
* | | | | | Merge topic 'findmpi-notfound-spam'Brad King2017-12-061-10/+16
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | bde7513d FindMPI: Correct legacy variable handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1557
| * | | | | FindMPI: Correct legacy variable handlingChristian Pfeiffer2017-12-051-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a minor logic error, MPI_LIBRARY, MPI_EXTRA_LIBRARY and MPI_<LANG>_LIBRARIES hints are currently not correctly handled and discarded. Additionally, if either C or CXX aren't enabled, there subsequent calls to FindMPI will cause cache variables of the sort "MPI_MPI_EXTRA_LIBRARY-NOTFOUND" to appear due to an error in the compatibility handling. (Doesn't affect functionality)
* | | | | | Merge topic 'findmpi-found-cond'Brad King2017-12-061-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 2047eb36 FindMPI: Fix multiple configure runs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1556
| * | | | | FindMPI: Fix multiple configure runsChristian Pfeiffer2017-12-051-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a erroneous logical dependency on a temporary variable, FindMPI would depend its FOUND status on the set of flags needed to support compiler-implicit MPI support after the first configure run. This behavior is especially causing a misreported NOT FOUND status after the first run on MPI implementations without MPI compiler like MS-MPI or MPICH2 on Windows.
* | | | | CMake Nightly Date StampHEADmasterKitware Robot2017-12-061-1/+1
| |/ / / |/| | |
* | | | Merge topic 'update-cm-thread'Brad King2017-12-053-48/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3519c8f2 utilities: Swapped to use std C++11 mutex/threading constructs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1551
| * | | | utilities: Swapped to use std C++11 mutex/threading constructsJustin Berger2017-12-013-48/+9
| | | | |
* | | | | Merge topic 'include_external_ms_project_support_non_windows_target'Brad King2017-12-053-1/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c06e9e7 include_external_msproject: Support non-Windows target platforms c89e8522 cmGlobalGenerator: Add IsIncludeExternalMSProjectSupported method Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1525
| * | | | | include_external_msproject: Support non-Windows target platformsTomoki Imai2017-12-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the command on any generator that supports it, even if the target platform does not define `WIN32`. Fixes: #17511
| * | | | | cmGlobalGenerator: Add IsIncludeExternalMSProjectSupported methodTomoki Imai2017-12-042-0/+6
| | | | | |
* | | | | | Merge topic 'src-genex-refactoring'Brad King2017-12-058-50/+114
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6bffc13e Refactor per-source generator expression evaluation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1550
| * | | | | | Refactor per-source generator expression evaluationMarc Chevrier2017-12-048-50/+114
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare to add generator expression support to more source properties. Factor out some duplicated code into a helper to avoid further duplication.
* | | | | | Merge topic 'update-cpplint'Brad King2017-12-055-6/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfcc2034 Update cpplint support to return 0 and mark warnings for CDash. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1544
| * | | | | | Update cpplint support to return 0 and mark warnings for CDash.Bill Hoffman2017-12-015-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes cpplint act like the other compiler mirroring tools. It will always return 0 even if it reports warnings and will only return non zero if there is a problem running the command. In addition, it will now add some extra text to allow CTest to recognize the warnings and report them correctly to CDash.
* | | | | | | Merge topic 'win-fallthrough'Brad King2017-12-052-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21541bb5 Use CM_FALLTHROUGH in Windows-specific code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1555
| * | | | | | | Use CM_FALLTHROUGH in Windows-specific codeBrad King2017-12-042-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some cases were missed by earlier sweeps due to not compiling Windows-specific code.
* | | | | | | | Merge topic 'ctest-chrono'Brad King2017-12-0518-134/+245
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 66419bc0 CTest: convert timeouts to std::chrono::duration 923b8fad IWYU: Add mappings for std::enable_if on chrono durations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1513
| * | | | | | | | CTest: convert timeouts to std::chrono::durationWouter Klouwen2017-12-0416-126/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit continues the refactoring of CTest to adopt std::chrono. After the last sets of changes that introduced std::chrono::steady_clock and std::chrono::system_clock respectively, it makes sense to have all the timeouts be stored as std::chrono::duration. No functional change intended.
| * | | | | | | | IWYU: Add mappings for std::enable_if on chrono durationsBrad King2017-11-289-8/+4
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IWYU incorrectly classifies this internal STL type as not internal, and suggests including `<type_traits>` for it. Work around the problem by mapping the offending names to a file that we always include. See include-what-you-use issue 434.
* | | | | | | | CMake Nightly Date StampKitware Robot2017-12-051-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'add_library-mention-xcode-objlib-behavior'Brad King2017-12-041-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c40ab26 add_library: mention that Xcode requires a real source file Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Tom Hughes <tomtheengineer@gmail.com> Merge-request: !1549
| * | | | | | | add_library: mention that Xcode requires a real source fileBen Boeckel2017-12-011-3/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs mentioned that it happened, but not when. Mention Xcode since it is the culprit today. See #16524.
* | | | | | | Merge topic 'pragma-once'Brad King2017-12-0421-3/+36
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d611868 Check*: Added include guards Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1327
| * | | | | | | Check*: Added include guardsCristian Adam2017-12-0121-3/+36
| | | | | | | |
* | | | | | | | Merge branch 'release-3.10'Brad King2017-12-040-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'cpack-pkg-fix' into release-3.10releaseBrad King2017-12-011-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1547
* | \ \ \ \ \ \ \ Merge topic 'cpack-pkg-fix'Brad King2017-12-041-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f25d87db CPack: Fix macOS PKG component dependency information Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1547
| * | | | | | | | CPack: Fix macOS PKG component dependency informationAlexander Wittig2017-12-011-1/+1
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.7.0-rc1~523^2 (CPack/PackageMaker: port to cmXMLWriter, 2016-06-08) accidentally broke `distribution.dist` generation when there are dependencies between components and the pkg (or the derived productbuild) generator are used. The resulting package cannot be installed and instead the Apple Installer app shows a "Javascript error" message. The problem is that a `std::ostringstream` is constructed with some content, but the stream pointer still points to the beginning of the stream, so subsequent writes overwrite the initial content instead of appending.
* | | | | | | | Merge topic 'csharp_project_without_sources'Brad King2017-12-044-6/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e654a37 VS: Enable generation of CSharp projects without initial .cs files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1521
| * | | | | | | | VS: Enable generation of CSharp projects without initial .cs filesMichael Stürmer2017-11-294-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #17388
* | | | | | | | | Merge topic 'update-kwsys'Brad King2017-12-041-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be8ec418 Merge branch 'upstream-KWSys' into update-kwsys 740ccb1f KWSys 2017-12-01 (0f0023b1) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1548
| * \ \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-12-011-0/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | * upstream-KWSys: KWSys 2017-12-01 (0f0023b1)
| | * | | | | | | KWSys 2017-12-01 (0f0023b1)KWSys Upstream2017-12-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 0f0023b1be404cb4a4f893c116c2f8b5190bd743 (master). Upstream Shortlog ----------------- Brad King (1): 7b6fa277 ConsoleBuf: Add explicit switch case fallthrough markup
* | | | | | | | | Merge topic 'cmake-job-pool'Brad King2017-12-045-0/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07185055 Ninja: add CMAKE_JOB_POOLS variable as default for JOBS_POOLS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1514
| * | | | | | | | | Ninja: add CMAKE_JOB_POOLS variable as default for JOBS_POOLSMatt McCormick2017-11-295-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables configuration of build parallelism with the Ninja generator by passing arguments on the command line to CMake. For example, cmake \ '-DCMAKE_JOB_POOLS:STRING=compile=5;link=2' \ -DCMAKE_JOB_POOL_COMPILE:STRING=compile \ -DCMAKE_JOB_POOL_LINK:STRING=link \ ~/src/MyProject
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-12-041-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-12-031-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-12-021-1/+1
| |/ / / / / / / / |/| | | | | | | |