summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | | | | FindLua: Set CMP0012 to NEW for the revised search codeAdriaan de Groot2018-07-031-0/+5
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code added by commit v3.12.0-rc1~53^2 (FindLua: Search for lua.h using more conventional paths, 2018-05-20) depends on `CMP0012` NEW behavior. Set the policy explicitly for the scope of the FindLua module. Fixes: #18142
* | | | | | | | | Merge topic 'gitignore-vscode'Brad King2018-07-051-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c01704e9f gitignore: Ignore a .vscode directory in the source tree Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2182
| * | | | | | | | | gitignore: Ignore a .vscode directory in the source treeDakota Hawkins2018-07-031-0/+3
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'revert-subdirectory-linking'Brad King2018-07-0518-107/+10
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d7114987c Revert "target_link_libraries: Allow use with targets in other directories" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2191
| * | | | | | | | Revert "target_link_libraries: Allow use with targets in other directories"Brad King2018-07-0318-107/+10
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.12.0-rc1~82^2 (target_link_libraries: Allow use with targets in other directories, 2018-05-11). The RHS target scoping and visibility rules are not clear and will need further investigation before the feature can be added. Issue: #17943
* | | | | | | | Merge topic 'math-hex'Brad King2018-07-0531-149/+399
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5dbee9d2d0 math: Add options to calculate and format output as hexadecimal 8661e7052c math: Diagnose divide-by-zero 7c4c13ffef math: Reject unexpected expression input explicitly 5b0f73a15a math: Use 64-bit integer type for computation 963b8d9f6c math: Add RunCMake.math test to prepare for error cases Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2056
| * | | | | | | | math: Add options to calculate and format output as hexadecimalDaniel Franke2018-07-0318-69/+221
| | | | | | | | |
| * | | | | | | | math: Diagnose divide-by-zeroDaniel Franke2018-06-266-51/+66
| | | | | | | | |
| * | | | | | | | math: Reject unexpected expression input explicitlyDaniel Franke2018-06-2612-120/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to C++ exceptions for lexer/parser error handling. Teach the lexer/parser to fail on unexpected input.
| * | | | | | | | math: Use 64-bit integer type for computationDaniel Franke2018-06-223-8/+12
| | | | | | | | |
| * | | | | | | | math: Add RunCMake.math test to prepare for error casesDaniel Franke2018-06-224-0/+16
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-07-051-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-07-041-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'safe_property'Brad King2018-07-037-23/+47
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42cc0644d5 Autogen: Use default and remove custom GetSafeProperty functions 127094f2f0 Add GetSafeProperty method to cmTarget, cmGeneratorTarget and cmSourceFile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2185
| * | | | | | | | Autogen: Use default and remove custom GetSafeProperty functionsSebastian Holtermann2018-07-021-23/+11
| | | | | | | | |
| * | | | | | | | Add GetSafeProperty method to cmTarget, cmGeneratorTarget and cmSourceFileSebastian Holtermann2018-07-026-0/+36
| | | | | | | | |
* | | | | | | | | Merge topic 'cpack-external'Brad King2018-07-0323-281/+1359
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c71548766 Help: Add release notes for CPack External generator 47c87cdd1f Help: Add documentation for CPack External generator 2ef966bc77 Testing: Add test for CPack External generator 80914d88da CPack: Add "CPack External" generator 3ced881db6 cmCPackGenerator: Store CPACK_INSTALL_CMAKE_PROJECTS in an internal field 4938abb600 cmCPackGenerator: Refactor InstallProjectViaInstallCMakeProjects() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2142
| * | | | | | | | | Help: Add release notes for CPack External generatorKyle Edwards2018-07-021-0/+8
| | | | | | | | | |
generated by cgit v0.12 at 2025-09-05 21:38:57 (GMT)