summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'issue-18883-support-for-multiple-targets'Brad King2019-03-0636-382/+432
|\ | | | | | | | | | | | | | | | | | | | | 324d18bb34 cmake: Teach --build mode to support multiple targets ebc94500c1 cmGlobalGenerator: Optimize Printable() method from GeneratedMakeCommand fdeb364a84 cmGlobalGenerator: Change case of methods from GeneratedMakeCommand struct b3955a08ab cmakemain: Remove ignored --use-stderr option from command line help f1367c8c51 cmGlobalGenerator: Remove unused code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2939
| * cmake: Teach --build mode to support multiple targetsBartosz Kosiorek2019-03-0536-328/+403
| | | | | | | | Fixes: #16136
| * cmGlobalGenerator: Optimize Printable() method from GeneratedMakeCommandBartosz Kosiorek2019-03-041-14/+1
| |
| * cmGlobalGenerator: Change case of methods from GeneratedMakeCommand structBartosz Kosiorek2019-03-048-58/+58
| |
| * cmakemain: Remove ignored --use-stderr option from command line helpBartosz Kosiorek2019-03-041-1/+0
| |
| * cmGlobalGenerator: Remove unused codeBartosz Kosiorek2019-03-041-11/+0
| |
* | Merge branch 'release-3.14'Brad King2019-03-060-0/+0
|\ \
| * \ Merge branch 'docs-install-destinations' into release-3.14Brad King2019-03-051-51/+85
| |\ \ | | | | | | | | | | | | Merge-request: !3052
| * \ \ Merge branch 'ios-docs' into release-3.14Brad King2019-03-052-1/+62
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !3047
| * \ \ \ Merge branch 'ios-variable' into release-3.14Brad King2019-03-054-0/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3051
* | \ \ \ \ Merge topic 'docs-install-destinations'Brad King2019-03-061-51/+85
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | a5f79b83c7 Help: clarify DESTINATION and TYPE usage for install() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3052
| * | | | | Help: clarify DESTINATION and TYPE usage for install()Craig Scott2019-03-051-51/+85
| | | | | |
* | | | | | Merge topic 'ios-docs'Brad King2019-03-062-1/+62
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 376138fe0c Help: CMAKE_MACOSX_BUNDLE is ON for iOS/tvOS/watchOS f7d602b572 Help: Example of tweaking iOS/tvOS/watchOS build 4a9e2e4f35 Help: find_package with fat iOS libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3047
| * | | | | Help: CMAKE_MACOSX_BUNDLE is ON for iOS/tvOS/watchOSRuslan Baratov2019-03-051-0/+3
| | | | | |
| * | | | | Help: Example of tweaking iOS/tvOS/watchOS buildRuslan Baratov2019-03-051-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMAKE_OSX_ARCHITECTURES and CMAKE_OSX_DEPLOYMENT_TARGET variables can be used to tweak iOS/tvOS/watchOS build
| * | | | | Help: find_package with fat iOS librariesRuslan Baratov2019-03-051-1/+11
| |/ / / /
* | | | | Merge topic 'ios-variable'Brad King2019-03-064-0/+11
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | e427c7c1d8 iOS: Add IOS variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3051
| * | | | iOS: Add IOS variableRuslan Baratov2019-03-054-0/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Since commit 11da882a12 (Apple: Introduce separate system name for iOS, tvOS, and watchOS, 2018-01-15, v3.14.0-rc1~14^2~1) we support setting `CMAKE_SYSTEM_NAME` to `iOS`. Existing iOS toolchain files already set `IOS` as a short-hand variable, so do the same here.
* | | | CMake Nightly Date StampKitware Robot2019-03-061-1/+1
| | | |
* | | | Merge topic 'restore_broken_curses_gui'Brad King2019-03-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa68ce6bd4 ccmake: fix curses dialog broken by refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Artur Ryt <artur.ryt@gmail.com> Merge-request: !3055
| * | | | ccmake: fix curses dialog broken by refactoringFelix Schwitzer2019-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During refactoring in commit f6291eee25 (cmCursesMainForm: Modernize with STL and ranged-for loops, 2019-02-10) a transformation of a loop went wrong and editing the cmake cache with ccmake no longer works. Make ccmake work again. Fixes: #19008
* | | | | Merge topic 'fix_autorcc_for_qt6'Brad King2019-03-052-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb97a377dd Autogen: Fallback on internal qrc parser when RCC isn't built yet Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3049
| * | | | | Autogen: Fallback on internal qrc parser when RCC isn't built yetAlexandru Croitor2019-03-042-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building a Qt project, the AUTORCC functionality, by default, uses the rcc binary to get the contents of a qrc file for dependency information. This is done at CMake "generate" time. The problem is that while configuring Qt itself, the rcc binary is not built yet. In that case, to get the contents of the qrc file, fall back to the code branch which uses an ifstream instead of the rcc binary.
* | | | | | CMake Nightly Date StampKitware Robot2019-03-051-1/+1
| | | | | |
* | | | | | Merge topic 'llvm-rc'Brad King2019-03-045-19/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e53a968ed5 MSVC: Use -D instead of /D in RC_FLAGS 1a281a1acd RC: Pass output file in a way that llvm-rc 7 and below understand fa339ced67 CMakeVersion.rc: Avoid preprocessor definitions to support llvm-rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3007
| * | | | | | MSVC: Use -D instead of /D in RC_FLAGSZsolt Parragi2019-03-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | llvm-rc can't handle definitions given with /D and without a space.
| * | | | | | RC: Pass output file in a way that llvm-rc 7 and below understandZsolt Parragi2019-02-273-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to LLVM 8.0, `llvm-rc` does not recognize `/fo` without a space after it. Add the space unconditionally because MS `rc` accepts it too. Issue: #18957
| * | | | | | CMakeVersion.rc: Avoid preprocessor definitions to support llvm-rcZsolt Parragi2019-02-271-14/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `llvm-rc` does not support them as of version 8.
* | | | | | | Merge branch 'release-3.14'Brad King2019-03-040-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'FindPython-NumPy-fix-include-dir' into release-3.14Brad King2019-03-042-3/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3053
| * \ \ \ \ \ \ Merge branch 'vs-fortran-rc' into release-3.14Brad King2019-03-013-1/+11
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | Merge-request: !3050
* | | | | | | | Merge topic 'FindPython-NumPy-fix-include-dir'Brad King2019-03-042-3/+2
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e3358336d FindPython: Fix NumPy component include directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3053
| * | | | | | | FindPython: Fix NumPy component include directoryMarc Chevrier2019-03-042-3/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the component added by commit 513e77550d (FindPython: Introduce NumPy component, 2018-12-12, v3.14.0-rc1~95^2). The `numpy/` sub-directory should not be part of the include directory. It should be part of the `#include` line.
* | | | | | | Merge topic 'vs-fortran-rc'Brad King2019-03-043-1/+11
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | 0b82f56ac6 VS: Fix Fortran target type selection with RC sources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3050
| * | | | | VS: Fix Fortran target type selection with RC sourcesBrad King2019-03-013-1/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Intel Fortran `.vfproj` files do support both Fortran and the Windows Resource compiler (`.rc)` files. Prior to CMake 3.9 we did not support that, but commit 2c9f35789d (VS: Decide project type by linker lang as fallback, 2017-03-30, v3.9.0-rc1~340^2) accidentally enabled it. It was then broken by commit d3d2c3cd49 (VS: Fix Fortran target type selection when linking C++ targets, 2019-02-04, v3.14.0-rc1~13^2). Restore support for Fortran+RC in VS projects and add a test case. Fixes: #19002
* | | | | CMake Nightly Date StampKitware Robot2019-03-041-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2019-03-031-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2019-03-021-1/+1
| | | |
* | | | Merge branch 'release-3.14'Brad King2019-03-010-0/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | CMake 3.14.0-rc3v3.14.0-rc3Brad King2019-03-011-1/+1
| | |
* | | Merge branch 'release-3.14'Brad King2019-03-010-0/+0
|\ \ \ | |/ /
| * | Merge branch 'findjni-paths' into release-3.14Brad King2019-03-011-52/+47
| |\ \ | | | | | | | | | | | | Merge-request: !3042
| * \ \ Merge branch 'ExternalProject-fix-log-in-custom-stamp' into release-3.14Brad King2019-03-011-2/+14
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !3045
| * \ \ \ Merge branch 'cuda_device_link_handle_frameworks' into release-3.14Brad King2019-03-011-0/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3039
| * \ \ \ \ Merge branch 'vs2019' into release-3.14Brad King2019-02-282-9/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3044
* | \ \ \ \ \ Merge topic 'cuda_device_link_handle_frameworks'Brad King2019-03-011-0/+12
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5d1b15654 CUDA: Filter out -framework arguments during device linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3039
| * | | | | | CUDA: Filter out -framework arguments during device linkingRobert Maynard2019-02-281-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The filter in commit e768d96c74 (CUDA: Filter out host link flags during device linking, 2018-10-22, v3.13.0-rc2~4^2~2^2) removes `-framework` but not the framework name that comes after it. Revise the logic to remove both. Fixes: #18911
* | | | | | | Merge topic 'ExternalProject-fix-log-in-custom-stamp'Brad King2019-03-011-2/+14
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6d3fee77c ExternalProject: Restore default log dir with custom stamp dir Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3045
| * | | | | | ExternalProject: Restore default log dir with custom stamp dirBrad King2019-03-011-2/+14
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit b6f6cac378 (ExternalProject: add LOG_DIR option that allows overriding of log location, 2018-10-12, v3.14.0-rc1~515^2~1) the log directory got its own option. The intention was to fall back to the stamp directory by default. However, the implementation actually only falls back to the same default as the stamp directory and does not consider a custom stamp dir. Update the default log dir computation to fall back to whatever is the final selection for the stamp dir. Fixes: #19000
* | | | | | Merge topic 'vs2019'Brad King2019-03-012-9/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9a7f3135e Help: Update VS 2019 generator release note for preview 4 00c1120837 VS: Drop workaround needed only for VS 2019 preview 2 and 3 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Egor Pugin <egor.pugin@gmail.com> Merge-request: !3044
generated by cgit v0.12 at 2025-01-10 05:09:54 (GMT)