summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-04-125-4/+95
|\ | | | | | | | | * upstream-KWSys: KWSys 2017-04-12 (23a4c211)
| * KWSys 2017-04-12 (23a4c211)KWSys Upstream2017-04-125-4/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 23a4c211e90c1cfd399c3632141dbd549a5db8cf (master). Upstream Shortlog ----------------- Brad King (2): 41a9dfef SystemInformation: Fix dynamic loader failure on WinXP SP2 3ead6158 SystemTools: Fix stat() wrapper compilation with Borland Daniel Pfeifer (1): ce5b0d34 Disable include-what-you-use Mathieu Westphal (1): a2bf6bb3 SystemTools: Add cross-platform stat() wrapper
* | Merge topic 'vs-refactor-source-loop'Brad King2017-04-124-93/+80
|\ \ | | | | | | | | | | | | | | | | | | | | | a2e91af9 cmGeneratorTarget: Drop unused GetIDLSources method a77158b2 VS: Refactor loop over classified sources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !689
| * | cmGeneratorTarget: Drop unused GetIDLSources methodBrad King2017-04-112-8/+0
| | |
| * | VS: Refactor loop over classified sourcesBrad King2017-04-112-85/+80
| | | | | | | | | | | | | | | Loop over all sources at once instead of looking up and looping over each kind of source separately.
* | | Merge topic 'xcode-object-arch-dir'Brad King2017-04-123-31/+61
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c346bbc Xcode: Compute a concrete object file arch dir if possible 5f4e26df Xcode: Refactor object directory name computation 5b29fd6d Xcode: Refactor internal architecture list construction b1eb493c cmGlobalGenerator: Abort generation earlier on export() error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !688
| * | | Xcode: Compute a concrete object file arch dir if possibleBrad King2017-04-112-1/+19
| | | |
| * | | Xcode: Refactor object directory name computationBrad King2017-04-112-10/+21
| | | | | | | | | | | | | | | | | | | | Factor out a helper function to compute the object directory name architecture component.
| * | | Xcode: Refactor internal architecture list constructionBrad King2017-04-112-17/+17
| | | | | | | | | | | | | | | | | | | | Factor population of the `Architectures` member out into a helper to avoid duplication.
| * | | cmGlobalGenerator: Abort generation earlier on export() errorBrad King2017-04-111-4/+5
| | | |
* | | | Merge topic 'update-kwiml'Brad King2017-04-121-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a53e18e Merge branch 'upstream-KWIML' into update-kwiml 93542c89 KWIML 2017-04-11 (ffc22537) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !690
| * \ \ \ Merge branch 'upstream-KWIML' into update-kwimlBrad King2017-04-111-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWIML: KWIML 2017-04-11 (ffc22537)
| | * | | | KWIML 2017-04-11 (ffc22537)KWIML Upstream2017-04-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwiml.git at commit ffc22537fabc40548b3de4a759303caaeea83646 (master). Upstream Shortlog ----------------- Daniel Pfeifer (1): ffc22537 test: Disable include-what-you-use
* | | | | | Merge topic 'doc-cmake-E-copy-no-wildcards'Brad King2017-04-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e68d014 Help: Add note about cmake -E copy not supporting wildcards Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !687
| * | | | | | Help: Add note about cmake -E copy not supporting wildcardsTim2017-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #16791
* | | | | | | Merge topic 'macos-hidpi-qt-dialog'Brad King2017-04-122-0/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9140305 macOS: Enable Hi-DPI support in applications by default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !682
| * | | | | | | macOS: Enable Hi-DPI support in applications by defaultĽubomír Carik2017-04-112-0/+9
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every desktop application should be HiDPI ready in present. Based on information from Qt documentation enabling properties in `Info.plist` is sufficient to activate this feature. Newer versions of `qmake` do it. Signed-off-by: Ľubomír Carik <Lubomir.Carik@gmail.com>
* | | | | | | CMake Nightly Date StampKitware Robot2017-04-121-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'vs-remove-UseObjectLibraries'Brad King2017-04-116-77/+46
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4af14ad VS: Simplify logic collecting object library files as sources 10772c51 VS: Simplify use of object libraries in WINDOWS_EXPORT_ALL_SYMBOLS 22829a13 cmMakefile: Create an explicit "Object Libraries" source group Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !686
| * | | | | VS: Simplify logic collecting object library files as sourcesBrad King2017-04-112-71/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Object library files are already included by `GetExternalObjects` and `GetConfigCommonSourceFiles` so we don't need to call `UseObjectLibraries` to get them.
| * | | | | VS: Simplify use of object libraries in WINDOWS_EXPORT_ALL_SYMBOLSBrad King2017-04-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Object library files are already included by `GetExternalObjects` so we don't need to call `UseObjectLibraries` to get them.
| * | | | | cmMakefile: Create an explicit "Object Libraries" source groupBrad King2017-04-113-5/+25
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | The generators should not need special logic to place object library object files in this group.
* | | | | Merge topic 'FindPythonInterp-3.6-windows'Brad King2017-04-111-2/+5
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 9d15d3c7 FindPythonInterp: Add `-32` and `-64` registry entry variants Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !675
| * | | | FindPythonInterp: Add `-32` and `-64` registry entry variantsRobert Dailey2017-04-101-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of 3.6.1 Python (only version tested in this case), installing 32-bit version on 64-bit windows has a slightly different registry key path. `-32` is appended to the end of the version number in the path. Also added a few more registry path guesses based on 64-bit version of Python. Also the module now checks if the host is WIN32 instead of the target, which is required if you are cross compiling.
* | | | | CMake Nightly Date StampKitware Robot2017-04-111-1/+1
| |/ / / |/| | |
* | | | Merge branch 'release'Brad King2017-04-100-0/+0
|\ \ \ \
| * | | | CMake 3.8.0v3.8.0Brad King2017-04-101-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2017-04-100-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'vs-rc-defines' into releaseBrad King2017-04-101-0/+4
| |\ \ \ \
* | \ \ \ \ Merge topic 'vs-rc-defines'Brad King2017-04-101-0/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 89b92a98 RC: Mark CMAKE_RC_FLAGS_<CONFIG> cache entries as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !685
| * | | | | RC: Mark CMAKE_RC_FLAGS_<CONFIG> cache entries as advancedBrad King2017-04-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were added by commit v3.8.0-rc4~4^2~1 (RC: Add missing CMAKE_RC_FLAGS_<CONFIG> entries to cache, 2017-03-28) and should be advanced as they are for other languages.
* | | | | | Merge branch 'release'Brad King2017-04-100-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'packaging-qtsdk' into releaseBrad King2017-04-102-17/+15
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'emulatorTargetPropertyDocs' into releaseBrad King2017-04-101-0/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'clarifyFileGenerateDocs' into releaseBrad King2017-04-101-0/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'clarifyRemoveDocs' into releaseBrad King2017-04-101-2/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'FindwxWidgets-new-syslibs' into releaseBrad King2017-04-101-1/+1
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge topic 'packaging-qtsdk'Brad King2017-04-102-17/+15
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94420a7b QtIFW: Improved packaging as part of the QtSDK Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !678
| * | | | | | | | | | QtIFW: Improved packaging as part of the QtSDKKonstantin Podsvirov2017-04-082-17/+15
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - Fix install script template (*.qs.in) to register on all platforms; - Add patch version numter to display name ("CMake X.Y" -> "CMake X.Y.Z").
* | | | | | | | | | Merge topic 'emulatorTargetPropertyDocs'Brad King2017-04-101-0/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 186dd877 Help: Cross compile variable used as initial value for target property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !683
| * | | | | | | | | Help: Cross compile variable used as initial value for target propertyCraig Scott2017-04-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Variable CMAKE_CROSSCOMPILING_EMULATOR is used to initialize CROSSCOMPILING_EMULATOR. Issue: #16785
* | | | | | | | | | Merge topic 'clarifyFileGenerateDocs'Brad King2017-04-101-0/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d039f741 Help: Clarify file(GENERATE) only writes output file at generation phase Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !681
| * | | | | | | | | Help: Clarify file(GENERATE) only writes output file at generation phaseCraig Scott2017-04-101-0/+5
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: #16556
* | | | | | | | | Merge topic 'clarifyRemoveDocs'Brad King2017-04-101-2/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 812274ff Help: Clarify what the -f option does for the remove command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !680
| * | | | | | | | Help: Clarify what the -f option does for the remove commandCraig Scott2017-04-101-2/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Closes: #16784
* | | | | | | | Merge topic 'FindwxWidgets-new-syslibs'Brad King2017-04-101-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae4b3b70 FindwxWidgets: link with the new required libs under MSW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !676
| * | | | | | | FindwxWidgets: link with the new required libs under MSWVadim Zeitlin2017-04-071-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Latest wxWidgets git master version and the upcoming 3.1.1 release requires linking with shlwapi and version DLLs. As this does no harm when using the previous versions, just do it unconditionally.
* | | | | | | Merge topic 'refactor-source-classification'Brad King2017-04-102-281/+186
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60307c50 cmGeneratorTarget: Replace source classifier implementation a9784d0e cmGeneratorTarget: Remove unnecessary condition Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !677
| * | | | | | | cmGeneratorTarget: Replace source classifier implementationBrad King2017-04-072-279/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compute and memoize the list of sources with their kinds for each configuration just once.
| * | | | | | | cmGeneratorTarget: Remove unnecessary conditionBrad King2017-04-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a condition where the "then" and "else" cases do the same thing.
generated by cgit v0.12 at 2024-12-27 11:19:03 (GMT)