summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Autogen: Refactor RerunMocPlugin test with fixed timestamp comparisonSebastian Holtermann2019-02-131-58/+93
| | | | | | | This refactors and simplifies the QtAutogen.RerunMocPlugin test. Repetitive task are packed into macros. By using version strings to store file timestamps, timestamp comparison becomes more reliable. Test status and error messages are improved.
* Merge topic 'names'Brad King2019-02-1311-270/+187
|\ | | | | | | | | | | | | fc8b90af2c Create and use `cmGeneratorTarget::Names` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2936
| * Create and use `cmGeneratorTarget::Names`Saleem Abdulrasool2019-02-1111-270/+187
| | | | | | | | | | | | Rather than taking a number of out parameters for the various names, create a structure that is reused for both `GetLibraryNames` and `GetExecutableNames`. Replace uses according to the new interface.
* | Merge topic 'systools-stdstring2'Brad King2019-02-137-74/+78
|\ \ | | | | | | | | | | | | | | | | | | 080a79ca4a cmSystemTools: More methods accept `std::string` params Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2952
| * | cmSystemTools: More methods accept `std::string` paramsVitaly Stakhovsky2019-02-117-74/+78
| |/
* | Merge topic 'cmcurses-fix-solaris-lambda-warning'Brad King2019-02-131-5/+6
|\ \ | | | | | | | | | | | | | | | | | | c28abdb5ac cmCursesMainForm: Fix lambda return type deducing warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2955
| * | cmCursesMainForm: Fix lambda return type deducing warningArtur Ryt2019-02-121-5/+6
| | | | | | | | | | | | | | | It was issued by sparc compiler on Solaris system See !2947
* | | Merge branch 'release-3.14'Brad King2019-02-130-0/+0
|\ \ \
| * \ \ Merge branch 'genex-GENEX_EVAL-fix-recursion' into release-3.14Brad King2019-02-134-14/+9
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2954
* | \ \ \ Merge topic 'genex-GENEX_EVAL-fix-recursion'Brad King2019-02-134-14/+9
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | e429e9af42 genex: Fix erroneous handling of recursion for $<GENEX_EVAL:> Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: yrHeTaTeJlb <jjj.bo@yandex.ru> Merge-request: !2954
| * | | | genex: Fix erroneous handling of recursion for $<GENEX_EVAL:>Marc Chevrier2019-02-134-14/+9
| | | | | | | | | | | | | | | | | | | | Fixes: #18894
* | | | | CMake Nightly Date StampKitware Robot2019-02-131-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'clangcl-fixes'Brad King2019-02-1210-11/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 091afa7342 Tests: Teach tests when to treat clang-cl as MSVC 006768903c Work around clang-cl breakage on make_unique/std::forward d625dfcdf9 Avoid compiling CMake itself as C++17 with Clang's MSVC ABI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2573
| * | | | Tests: Teach tests when to treat clang-cl as MSVCZsolt Parragi2019-02-117-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Disable the system include unused variable test in ExportImport when clang is in MSVC compatible mode. * Disable CxxDialect testcase when clang is in MSVC compatible mode, as it doesn't support `typeof`. * Teach Module.WriteCompilerDetectionHeader to treat clang-cl as MSVC. * Disable the SystemIncludeDirectories testcase within IncludeDirectories when clang is in MSVC compatible mode. * Disable the CMakeOnly.CheckCXXCompilerFlag testcase when clang is in MSVC compatible mode. * Treat clang-cl as MSVC in LinkOptions.cmake in the try_run and try_compile testcases.
| * | | | Work around clang-cl breakage on make_unique/std::forwardZsolt Parragi2019-02-112-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang on Windows with the MSVC ABI produces link errors of the form `unresolved std::_Iosb<int>::{app,_Openmode} in ...`. Use a temporary variable to forward as lvalue rather than rvalue to work around the problem.
| * | | | Avoid compiling CMake itself as C++17 with Clang's MSVC ABIZsolt Parragi2019-02-111-0/+13
| | |_|/ | |/| | | | | | | | | | | | | | | | | | GUID functions in ATL cause compilation errors with this compiler. Add the offending case to our check for C++17 support so that it is not used by default when it does not work.
* | | | Merge topic 'progress-stdstring'Brad King2019-02-1222-50/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 950c099d83 cmake: Progress functions use `std::string` param Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2948
| * | | | cmake: Progress functions use `std::string` paramVitaly Stakhovsky2019-02-1122-50/+58
| |/ / /
* | | | Merge topic 'modernize-cmCursesMainForm'Brad King2019-02-121-62/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6291eee25 cmCursesMainForm: Modernize with STL and ranged-for loops Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2947
| * | | | cmCursesMainForm: Modernize with STL and ranged-for loopsArtur Ryt2019-02-101-62/+48
| | | | |
* | | | | Merge topic 'cmCTestRunTest-compress'Brad King2019-02-122-78/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 948c55857e cmCTestRunTest: Remove duplicated compression logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2946
| * | | | | cmCTestRunTest: Remove duplicated compression logicRegina Pfeifer2019-02-102-78/+11
| |/ / / /
* | | | | Merge branch 'release-3.14'Brad King2019-02-120-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'doc-if-legacy' into release-3.14Brad King2019-02-111-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2950
| * \ \ \ \ Merge branch 'FindMatlab-version-empty' into release-3.14Brad King2019-02-111-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2949
| * \ \ \ \ \ Merge branch 'FindOctave-interp-target' into release-3.14Brad King2019-02-113-1/+43
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2931
* | \ \ \ \ \ \ Merge topic 'FindMatlab-version-empty'Brad King2019-02-121-2/+2
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40176749bc FindMatlab: Tolerate empty version log file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2949
| * | | | | | | FindMatlab: Tolerate empty version log fileSebastian Nagel2019-02-111-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge topic 'doc-if-legacy'Brad King2019-02-121-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 572b4fd85b Help: Fix elseif/endif typo Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2950
| * | | | | | Help: Fix elseif/endif typoJuuso "Linda" Lapinlampi2019-02-111-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CMake 3.13.x, we had this evaluation for if() conditions: if(a) elseif(b) else(a) endif(a) The sensible intention of the change in commit c2efb3efcd (Help: Revise docs on Scripting Commands, 2018-10-16, v3.14.0-rc1~505^2) was: > "endif", "endfunction" etc: Explain that the argument is optional and > maintained for compatibility only Instead of "endif", it ended up being written to the documentation as "elseif" by the commit author (oops) to if()'s page. if(a) elseif(a!?) else() endif(a?) Truthfully, endif()'s parameter should be an optional verbatim repeat and not elseif()'s. If it wasn't, elseif() would be described to be the same as if(). The rightful intended description is: if(a) elseif(b) else() endif() Fix that typo.
* | | | | | Merge topic 'FindOctave-interp-target'Brad King2019-02-123-1/+43
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 6725975bd8 FindOctave: Add target for octinterp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2931
| * | | | | FindOctave: Add target for octinterpPeter Stroia-Williams2019-02-083-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds the Octave::Octinterp target to make the octinterp library available without users having to resort to using the Octave_INTERP_LIBRARY variable.
* | | | | | CMake Nightly Date StampKitware Robot2019-02-121-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'ctest-exit-code-int64'Brad King2019-02-114-7/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 440b08e4f0 CTest: Represent process exit codes as 64-bit signed integer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2944
| * | | | | CTest: Represent process exit codes as 64-bit signed integerZsolt Parragi2019-02-084-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exit code constants on Windows, such as `STATUS_NO_MEMORY` do not fit in a 32-bit signed integer type. They do fit in an unsigned 32-bit type, but for compatibility with UNIX semantics we treat exit codes as signed. Use a 64-bit signed integer to handle both.
* | | | | | Merge topic 'modernize-for-loops'Brad King2019-02-1147-419/+332
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01b2d6ab74 Modernize: Use ranged for-loops when possible 15bdbec017 cmAlgorithms: Make cmRange advance/retreat safe for rvalues Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de> Merge-request: !2901
| * | | | | | Modernize: Use ranged for-loops when possibleArtur Ryt2019-02-0746-416/+317
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced most manual `const_iterator`-based loops and some reverse-iterator loops with range loops. Fixes: #18858
| * | | | | | cmAlgorithms: Make cmRange advance/retreat safe for rvaluesArtur Ryt2019-02-071-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In rvalue context these functions have to return cmRange by copy instead of reference to temporary object It allows to use ranged-for over cmMakeRange(xxx).advance(yyy)
* | | | | | | Merge branch 'release-3.14'Brad King2019-02-110-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'ghs-relnotes' into release-3.14Brad King2019-02-111-0/+28
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2934
| * \ \ \ \ \ \ Merge branch 'ghs-updates' into release-3.14Brad King2019-02-087-2/+24
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2943
| * \ \ \ \ \ \ \ Merge branch 'fix-exclude-dir-with-iface' into release-3.14Brad King2019-02-083-1/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2937
* | \ \ \ \ \ \ \ \ Merge topic 'ghs-relnotes'Brad King2019-02-111-0/+28
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d701b78de Help: Update 3.14 release notes for GHS changes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2934
| * | | | | | | | | Help: Update 3.14 release notes for GHS changesFred Baksik2019-02-111-0/+28
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'ghs-updates'Brad King2019-02-117-2/+24
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcd99fac60 GHS: Document usage of GHS_NO_SOURCE_GROUP_FILE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2943
| * | | | | | | | GHS: Document usage of GHS_NO_SOURCE_GROUP_FILEFred Baksik2019-02-087-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Also change variable name to CMAKE_GHS_NO_SOURCE_GROUP_FILE
* | | | | | | | | Merge topic 'fix-exclude-dir-with-iface'Brad King2019-02-113-1/+5
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f87e724e8c Fix EXCLUDE_FROM_ALL on directory with an interface library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2937
| * | | | | | | | Fix EXCLUDE_FROM_ALL on directory with an interface libraryBrad King2019-02-083-1/+5
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit dc6888573d (Pass EXCLUDE_FROM_ALL from directory to targets, 2019-01-15, v3.14.0-rc1~83^2) we automatically forward the `EXCLUDE_FROM_ALL` to targets as they are created. This regressed support for interface libraries on which the property is not allowed. Skip forwarding the `EXCLUDE_FROM_ALL` property for interface libraries. It is not needed on them because they do not participate in the generated build system anyway. Fixes: #18896
* | | | | | | | CMake Nightly Date StampKitware Robot2019-02-111-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-02-101-1/+1
| | | | | | |