summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Autogen: Wrap moc/uic/rcc related variables in structsSebastian Holtermann2018-07-112-109/+120
|
* Autogen: Improve error detection during configurationSebastian Holtermann2018-07-113-121/+239
| | | | | | | | | | | | | | cmQtAutoGenInitializer::InitCustomTargets and cmQtAutoGenInitializer::SetupCustomTargets now return their success value which gets evaluated and passed on by the caller (cmGlobalGenerator). Checks for the existance of the moc/uic/rcc binaries have been introduces in cmQtAutoGenInitializer. Additionally they get called once with a "-h" argument to determine if they're functional. This way any binary-not-found problem is caught during the configuration phase.
* CMake Nightly Date StampKitware Robot2018-07-111-1/+1
|
* Merge branch 'release-3.12'Brad King2018-07-100-0/+0
|\
| * Merge branch 'document_object_library_as_a_property_type' into release-3.12Brad King2018-07-101-2/+2
| |\ | | | | | | | | | Merge-request: !2199
* | \ Merge topic 'document_object_library_as_a_property_type'Brad King2018-07-101-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 741fd1c773 Help: Add OBJECT_LIBRARY to TYPE target property documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2199
| * | Help: Add OBJECT_LIBRARY to TYPE target property documentationRobert Maynard2018-07-101-2/+2
| |/
* | Merge topic 'skip_mfc_test'Brad King2018-07-101-0/+4
|\ \ | | | | | | | | | | | | | | | | | | eb2ee1dc7e Tests: skip MFC test when building cmake when no file association for vcproj Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2196
| * | Tests: skip MFC test when building cmake when no file association for vcprojFred Baksik2018-07-091-0/+4
| | |
* | | Merge topic 'uwp'Brad King2018-07-108-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | de5a4653d7 Add WindowsPhone and WindowsStore platform modules for Clang/GNU C/CXX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2197
| * | | Add WindowsPhone and WindowsStore platform modules for Clang/GNU C/CXXMartin Storsjö2018-07-078-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just like the existing WindowsPhone and WindowsStore platform modules for MSVC, just include the corresponding Windows platform modules. MinGW tools (both with GCC and Clang) can be used for building for Windows Store, even though it isn't a very common or simple setup.
* | | | Merge topic 'vs-deployment-files'Brad King2018-07-104-29/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b2ea092ef Help: Add documentation for DEPLOYMENT_ADDITIONAL_FILES b771b2c300 VS: extended OutputDeploymentDebuggerTool for AdditionalFiles 2f4075fa45 VS: moved EscapeForXML function higher up and made static Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2184
| * | | | Help: Add documentation for DEPLOYMENT_ADDITIONAL_FILESFrank Goyens2018-07-093-0/+26
| | | | |
| * | | | VS: extended OutputDeploymentDebuggerTool for AdditionalFilesFrank Goyens2018-07-091-18/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `OutputDeploymentDebuggerTool` function now also retrieves a target property that is used for setting the `AdditionalFiles` attribute of `DeploymentTool`.
| * | | | VS: moved EscapeForXML function higher up and made staticFrank Goyens2018-07-061-11/+12
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-07-101-1/+1
| | | | |
* | | | | Merge topic 'emacs-fix-unescaped-character-literals'Brad King2018-07-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67ae6da331 cmake-mode.el: Fix "unescaped character literals" warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2195
| * | | | | cmake-mode.el: Fix "unescaped character literals" warningJeff Kowalski2018-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emacs 27.0 warns Loading ‘cmake-mode’: unescaped character literals `?(', `?)' detected! during byte-compilation of cmake-mode.el The new warning was added in emacs commit c2bbdc3316 (Warn about missing backslashes during load). Add backslashes to escape the literals.
* | | | | | Merge topic 'option-normal-variable'Brad King2018-07-0913-24/+116
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a5f5c0e31 option: respect existing normal variable 12e6f83319 Option: Add a test that verifies interaction with normal variables 5bb3d40a28 cmOption: Remove VTK 4.0 workarounds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2155
| * | | | | | option: respect existing normal variableRobert Maynard2018-07-0915-28/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add policy CMP0077 to change this behavior in a compatible way.
| * | | | | | Option: Add a test that verifies interaction with normal variablesRobert Maynard2018-06-212-0/+17
| | | | | | |
| * | | | | | cmOption: Remove VTK 4.0 workaroundsRobert Maynard2018-06-211-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake has no reason to have special logic to fix bad logic within VTK 4.0.
* | | | | | | Merge branch 'release-3.12'Brad King2018-07-090-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | CMake 3.12.0-rc3v3.12.0-rc3Brad King2018-07-091-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.12'Brad King2018-07-090-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'csharp-link-file' into release-3.12Brad King2018-07-091-4/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2177
* | \ \ \ \ \ \ Merge topic 'csharp-link-file'Brad King2018-07-091-4/+7
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a6107650e VS: Only link cs files when they're not in binary dir Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Stürmer <michael.stuermer@schaeffler.com> Merge-request: !2177
| * | | | | | | VS: Only link cs files when they're not in binary dirRobert Dailey2018-07-061-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `*.cs` files are provided, do not generate a `<Link>` element in the `.csproj` project if those files are descendants of `CMAKE_CURRENT_BINARY_DIR`. This comparison happens for each file.
* | | | | | | | CMake Nightly Date StampKitware Robot2018-07-091-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-07-081-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-07-071-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'vsnasm-quoting'Brad King2018-07-065-6/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb694f8cd6 VS: Properly quote arguments in nasm.xml Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2179
| * | | | | | VS: Properly quote arguments in nasm.xmlDavid Benjamin2018-07-025-6/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most arguments were quoted, but some weren't, causing problems if the arguments contained whitespace. In particular, the _STL_EXTRA_DISABLED_WARNINGS value takes spaces and CMake's NASM support applies all add_definitions lines to NASM. The -D flag is missing quotes, so projects using NASM and setting _STL_EXTRA_DISABLED_WARNINGS break in the Visual Studio generator. Likewise, the -o flag is missing quotes, which means filenames with spaces do not work. (The -U flag is unlikely to need quotes, but include them for consistency.) Extend the existing VSNASM test to cover these cases.
* | | | | | | Merge topic 'FindCURL-per-config'Brad King2018-07-062-13/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59b3e78451 FindCURL: Find debug and release variants separately 6a9fe250a7 FindCURL: Improve CURL::libcurl property code layout Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1940
| * | | | | | | FindCURL: Find debug and release variants separatelyHiroshi Miura2018-07-032-13/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17887
| * | | | | | | FindCURL: Improve CURL::libcurl property code layoutHiroshi Miura2018-07-031-2/+4
| | | | | | | |
* | | | | | | | Merge topic 'list-command-insert'Brad King2018-07-064-6/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a08154d493 list: Allow inserting at the end of a list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2181
| * | | | | | | | list: Allow inserting at the end of a listDaniel Chabrowski2018-07-054-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18069
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-07-061-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.12'Brad King2018-07-050-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'doc-add_compile_definitions' into release-3.12Brad King2018-07-051-3/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2192
| * \ \ \ \ \ \ \ \ Merge branch 'revert-subdirectory-linking' into release-3.12Brad King2018-07-0318-107/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2191
| * \ \ \ \ \ \ \ \ \ Merge branch 'FindLua-CMP0012' into release-3.12Brad King2018-07-031-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2189
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'backport-UseSWIG-legacy-targets' into release-3.12Brad King2018-07-035-53/+115
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Merge-request: !2188
* | | | | | | | | | | | Merge topic 'doc-add_compile_definitions'Brad King2018-07-051-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89e3e62e13 Help: fix add_compile_definitions() documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2192
| * | | | | | | | | | | Help: fix add_compile_definitions() documentationMarc Chevrier2018-07-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18147
* | | | | | | | | | | | Merge topic 'UseSWIG-legacy-targets'Brad King2018-07-056-55/+118
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f2b483c06 Merge branch 'backport-UseSWIG-legacy-targets' into UseSWIG-legacy-targets 38ffcedd26 UseSWIG: reintroduce legacy target name management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2188
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'backport-UseSWIG-legacy-targets' into UseSWIG-legacy-targetsBrad King2018-07-036-55/+118
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | Resolve conflicts by integrating changes from both sides.
| | * | | | | | | | | | | UseSWIG: reintroduce legacy target name managementMarc Chevrier2018-07-035-53/+115
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18140
* | | | | | | | | | | | Merge topic 'FindLua-CMP0012'Brad King2018-07-051-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91f4adb028 FindLua: Set CMP0012 to NEW for the revised search code Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Rolf Eike Beer <eike@sf-mail.de> Acked-by: Alexander Grund <github@grundis.de> Merge-request: !2189
generated by cgit v0.12 at 2025-01-21 09:04:48 (GMT)