summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* UseEcos: Fix for separate <DEFINES> and <INCLUDES> placeholdersFlorian Schmaus2017-05-191-2/+2
| | | | | | | | | Update the module to account for commit v3.4.0-rc1~342^2 (Factor an <INCLUDES> placeholder out of <FLAGS> in rule variables, 2015-07-13) and v2.6.0~537 (Create COMPILE_DEFINITIONS property for targets and source files, 2008-01-14). Fixes: #16904
* Merge topic 'string-append'Brad King2017-05-1813-28/+28
|\ | | | | | | | | | | | | 9e24af01 Use string(APPEND) in Modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !864
| * Use string(APPEND) in ModulesDaniel Pfeifer2017-05-1713-28/+28
| | | | | | | | | | | | | | Automate with: find Modules -type f -print0 | xargs -0 perl -i -0pe \ 's/set\(([a-zA-Z0-9_\$\{\}]+)(\s+)"\$\{\1\}([^"])/string(APPEND \1\2"\3/g'
* | Merge topic 'cpack-archive-per-component-filename'Brad King2017-05-189-17/+100
|\ \ | | | | | | | | | | | | | | | | | | 9e06e97d CPack/Archive: per component filenames support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !859
| * | CPack/Archive: per component filenames supportDomen Vrankar2017-05-169-17/+100
| | | | | | | | | | | | | | | | | | Support for setting archive packager specific per component filenames and monolithic package filenames.
* | | Merge topic 'source_group-TREE-relative-path'Brad King2017-05-186-23/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4716f2be source_group: Restore TREE support for relative paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !852
| * | | source_group: Restore TREE support for relative pathsMateusz Janek2017-05-176-23/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit v3.8.1~4^2 (source_group: Fix TREE with root that is not current source dir, 2017-04-20) accidentally broke support for specifying paths relative to the source directory. Fix it and add a test covering the case. While at it, fix a typo in a variable name. Fixes: #16876
* | | | Merge topic 'vs14-GNUtoMS'Brad King2017-05-181-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c02d4d2a GNUtoMS: Add search path for VS 2015 environment scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !854
| * | | | GNUtoMS: Add search path for VS 2015 environment scriptsAlex Ghosh2017-05-171-0/+2
| |/ / /
* | | | Merge topic 'rel-osx-qt-version'Brad King2017-05-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e41abbd Utilities/Release: Switch macOS binary to Qt 5.6.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !862
| * | | | Utilities/Release: Switch macOS binary to Qt 5.6.2Brad King2017-05-171-1/+1
| | |_|/ | |/| | | | | | | | | | Update from 5.6.0.
* | | | Merge topic 'fix-invalid-export-name'Brad King2017-05-181-7/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d754ad5 bindexplib: Skip symbols containing a dot (.) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !855
| * | | | bindexplib: Skip symbols containing a dot (.)Albert Ziegenhagel2017-05-161-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbols including a dot are not valid and result in a `LNK1242` error when trying to create a library from the def file. Such symbols happen to be in object files when using PGI Fortran on Windows and compiling with debug symbols enabled. Those symbols do not need to be exported.
* | | | | Merge topic 'update-kwsys'Brad King2017-05-1820-476/+345
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16ebd9f6 Merge branch 'upstream-KWSys' into update-kwsys 7be70ca6 KWSys 2017-05-16 (fe1f22ce) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !856
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-05-1620-476/+345
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-05-16 (fe1f22ce)
| | * | | | KWSys 2017-05-16 (fe1f22ce)KWSys Upstream2017-05-1620-476/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit fe1f22ceefdae18df33e5bab8483fec7a82d4cee (master). Upstream Shortlog ----------------- Adam Weisi (3): 8a799e36 Process: Improve definition ordering in header file 7d56ef24 Process: Save results from all children internally b7eba998 Process: Add APIs to get results of individual processes Ben Boeckel (2): cea71543 style: remove separator comments 874dc559 style: help clang-format near macros
* | | | | | Merge topic 'ninja-compile_commands.json'Brad King2017-05-181-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b554caf7 Ninja: List compile_commands.json as generated by CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !849
| * | | | | | Ninja: List compile_commands.json as generated by CMakeKevin Puetz2017-05-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a false-positive `CMP0058` warning if any custom rules depend on `compile_commands.json` (e.g. to trigger rerunning clang-tooling utilities). Fixes: #16444
* | | | | | | Merge topic 'removeSetModulePath'Brad King2017-05-184-12/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0fb0f346 Tests: Remove unnecessary setting of CMAKE_MODULE_PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !853
| * | | | | | | Tests: Remove unnecessary setting of CMAKE_MODULE_PATHCraig Scott2017-05-154-12/+0
| |/ / / / / /
* | | | | | | Merge topic 'gtest_add_tests'Brad King2017-05-1811-27/+302
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6edd1806 GoogleTest: Expand capabilities of gtest_add_tests() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !839
| * | | | | | | GoogleTest: Expand capabilities of gtest_add_tests()Craig Scott2017-05-1511-27/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now has keyword-based arguments (old syntax form is still supported). Discovered tests can have a prefix and/or suffix added to the test names and the list of discovered tests is available to the caller. The working dir can also be set and the dependency on the source files is now optional instead of mandatory.
* | | | | | | | Merge topic 'update-libuv'Brad King2017-05-1848-710/+964
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 223d92e0 libuv: Update build within CMake ed17516b Merge branch 'upstream-libuv' into update-libuv 12a78bc8 libuv 2017-05-09 (e11dcd43) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !847
| * | | | | | | | libuv: Update build within CMakeBrad King2017-05-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update our CMake build rules to account for upstream changes.
| * | | | | | | | Merge branch 'upstream-libuv' into update-libuvBrad King2017-05-1547-710/+957
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-libuv: libuv 2017-05-09 (e11dcd43) Fixes: #16878
| | * | | | | | | | libuv 2017-05-09 (e11dcd43)libuv upstream2017-05-1547-711/+957
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libuv/libuv.git at commit e11dcd4377185359874e67f4962995fdb7e83d19 (v1.x).
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-05-181-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'note-unstage-before-update'Brad King2017-05-171-0/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c25adb2 Help/dev: note that unstaging before an update is unnecessary Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !863
| * | | | | | | | | Help/dev: note that unstaging before an update is unnecessaryBen Boeckel2017-05-171-0/+4
|/ / / / / / / / /
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-05-171-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge branch 'release'Brad King2017-05-160-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mingw-w64-compile' into releaseBrad King2017-05-152-0/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'vs_fix_cpp_debugging_with_cs_enabled' into releaseBrad King2017-05-151-11/+11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'FindOpenSSL-crypto-only' into releaseBrad King2017-05-151-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'FindDevIL-compat' into releaseBrad King2017-05-151-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge topic 'xcode-try_compile-scheme'Brad King2017-05-161-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c608000a Xcode: Work around xcodebuild spurious hangs in try_compile b8e707a6 Xcode: Refactor internal decision for scheme generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !850
| * | | | | | | | | | | | Xcode: Work around xcodebuild spurious hangs in try_compileBrad King2017-05-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `xcodebuild` occasionally hangs on some macOS machines (and can be reproduced independent of CMake). It only happens a few times in 1000 runs, but configuration of a large project calls `try_compile` many times and therefore frequently hangs due to this problem. I've been unable to reproduce the hang when using a scheme to build, so always generate a scheme in `try_compile` projects to work around the problem. Issue: #16752
| * | | | | | | | | | | | Xcode: Refactor internal decision for scheme generationBrad King2017-05-151-4/+5
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the Xcode version check out to wrap everything.
* | | | | | | | | | | | Merge topic 'early-config-name'Brad King2017-05-164-13/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eeb47fbe cmLocalCommonGenerator: Save CMAKE_BUILD_TYPE on construction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !848
| * | | | | | | | | | | | cmLocalCommonGenerator: Save CMAKE_BUILD_TYPE on constructionBrad King2017-05-154-13/+4
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy the value to our `ConfigName` member on construction to ensure it is available even to code paths that run before `Generate`. We once needed to delay this lookup until `Generate` because the local generators were at one time created before `Configure`. Now they are created at generate time which is late enough to expect `CMAKE_BUILD_TYPE` to be available. Without this, `cmGlobalUnixMakefileGenerator3::WriteConvenienceRules` causes use of `ConfigName` before it is populated which breaks use of source files that depend on the `$<CONFIG>` generator expression. Fixes: #16889
* | | | | | | | | | | | Merge topic 'cpackifw-i18n'Brad King2017-05-166-25/+145
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72ac7ad9 CPackIFW: Internationalization Support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !748
| * | | | | | | | | | | | CPackIFW: Internationalization SupportKonstantin Podsvirov2017-05-126-25/+145
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - DISPLAY_NAME and DESCRIPTION in CPackIFW module now is MULTI_ARGS; - Added internationalization support for DisplayName and Description properties in cmCPackIFWPackage class; - Added documentation to CPackIFW module; - Added release note.
* | | | | | | | | | | | Merge topic 'extra-fphsa-space'Brad King2017-05-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c515e19 FPHSA: remove extra space Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !843
| * | | | | | | | | | | | FPHSA: remove extra spaceBen Boeckel2017-05-151-2/+2
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each missing variable is added to the string as " ${var}" which causes the string to always have a leading space. Remove the duplicate space due to this in the output.
* | | | | | | | | | | | Merge topic 'GNU-FindBinUtils-patterns'Brad King2017-05-161-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75accaae GCC: more patterns for ar/ranlib Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !838
| * | | | | | | | | | | | GCC: more patterns for ar/ranlibRuslan Baratov2017-05-141-2/+10
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'mingw-w64-compile'Brad King2017-05-162-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9557b403 cmFileCommand: Fix build on mingw-w64 845f5e3c bootstrap: fix build on mingw-w64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !837
| * | | | | | | | | | | | cmFileCommand: Fix build on mingw-w64Aleksey Chernov2017-05-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include header needed for `CP_ACP`.
| * | | | | | | | | | | | bootstrap: fix build on mingw-w64Aleksey Chernov2017-05-151-0/+1
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define the default code page for EncodingCXX too.
* | | | | | | | | | | | Merge topic 'vs_fix_cpp_debugging_with_cs_enabled'Brad King2017-05-161-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6b39a5a VS: Fix debugging of C++ executables if CSharp is enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !844
generated by cgit v0.12 at 2025-01-09 18:04:47 (GMT)