summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | | CMake Nightly Date StampKitware Robot2017-04-101-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-04-091-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-04-081-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'multi-config-no-build-type'Brad King2017-04-073-6/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8187b884 Do not initialize CMAKE_BUILD_TYPE on multi-config generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !666
| * | | | | Do not initialize CMAKE_BUILD_TYPE on multi-config generatorsBastien Schatt2017-04-063-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the `GENERATOR_IS_MULTI_CONFIG` global property to reliably detect multi-config generators regardless of what variables the project or user have set.
* | | | | | Merge topic 'FindBoost-fix-release-names'Brad King2017-04-071-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6115875b FindBoost: Fix release name candidate list construction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !673
| * | | | | FindBoost: Fix release name candidate list constructionyume todo2017-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in commit 3ca6f70f (FindBoost: Allow testing for multiple compiler suffixes, 2017-03-28) accidentally left a `set()` instead of a `list(APPEND)` while constructing `_boost_RELEASE_NAMES`. Fix the logic to match what was done for `_boost_DEBUG_NAMES`. Otherwise we drop some of the candidate names.
* | | | | | CMake Nightly Date StampKitware Robot2017-04-071-1/+1
| | | | | |
* | | | | | Merge topic 'doc-dev-review-comments'Brad King2017-04-061-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43381b4d Help/dev: Document preferred page for MR comments Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !672
| * | | | | Help/dev: Document preferred page for MR commentsBrad King2017-04-061-0/+4
|/ / / / /
* | | | | Merge topic 'include_external_msproject-map-config'Brad King2017-04-0615-25/+75
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 227de0b9 include_external_msproject: Honor MAP_IMPORTED_CONFIG_<CONFIG> 4cd815f0 VS: Pass whole target to WriteProjectConfigurations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !669
| * | | | | include_external_msproject: Honor MAP_IMPORTED_CONFIG_<CONFIG>Beeble2017-04-0511-11/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows projects added via `include_external_msproject` to compile the preferred configuration despite different naming conventions.
| * | | | | VS: Pass whole target to WriteProjectConfigurationsBeeble2017-04-056-14/+14
| | | | | |
* | | | | | Merge topic 'codelite-virtual-dirs'Brad King2017-04-062-17/+88
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8243fe7c CodeLite: Distribute source files into folders (virtual directories) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !653
| * | | | | | CodeLite: Distribute source files into folders (virtual directories)rahmjan2017-03-312-17/+88
| | | | | | |
* | | | | | | Merge topic 'bindexplib-format'Brad King2017-04-061-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c216e803 bindexplib: Run clang-format on header file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !670
| * | | | | | | bindexplib: Run clang-format on header fileBrad King2017-04-051-0/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-04-061-1/+1
| |_|_|/ / / / |/| | | | | |
generated by cgit v0.12 at 2024-11-07 09:23:23 (GMT)