summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CUDA: Add a test to verify device linking can handle circular depsRobert Maynard2018-07-176-0/+61
|
* Merge branch 'release-3.12'Brad King2018-07-120-0/+0
|\
| * Merge branch 'qnx_fix' into release-3.12Brad King2018-07-121-0/+2
| |\ | | | | | | | | | Merge-request: !2205
* | \ Merge topic 'qnx_fix'Brad King2018-07-121-0/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | e014df762b QNX: Fix autogen compiler predefines detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2205
| * | QNX: Fix autogen compiler predefines detectionCristian Adam2018-07-111-0/+2
| | | | | | | | | | | | | | | | | | In commit v3.12.0-rc1~20^2 (Move GNU COMPILER_PREDEFINES_COMMAND from Platform to Compiler, 2018-06-01), `Compiler/GNU.cmake` introduced the `-dM` flag, which requires `-Wp` prefix for the QNX compiler wrapper.
* | | Merge topic 'ghs'Brad King2018-07-1210-161/+266
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce4f20ba62 GHS: Add release notes 281c601024 GHS: Update default BSP name 01c98c6ccc GHS: Update setting default OS location for Integrity platforms bb77dc0cee GHS: Set primary target using arch/platform values (or user specified value) f80692cf60 GHS: Add platform selection support a37a4a00c8 GHS: Add toolset selection support 5d40d2b44f GHS: Support ARM, PPC, 86 architectures Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Matt Soucy <matthew.soucy@baesystems.com> Merge-request: !798
| * | | GHS: Add release notesFred Baksik2018-07-111-0/+20
| | | |
| * | | GHS: Update default BSP nameFred Baksik2018-07-113-12/+19
| | | | | | | | | | | | | | | | | | | | -- Use default value of sim<arch> if not user defined -- Also no reason to trim quotes or changes slashes; it is just a name not a path
| * | | GHS: Update setting default OS location for Integrity platformsFred Baksik2018-07-112-27/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Update how the latest OS is determined; scan the location GHS_OS_ROOT and sort it No longer use registry settings looking for installations The registry values are assigned in installation order for Green Hills tools not version order Filter out files from the list of directories (i.e if int1234.zip and int1234 are both in root folder)
| * | | GHS: Set primary target using arch/platform values (or user specified value)Fred Baksik2018-07-114-4/+26
| | | |
| * | | GHS: Add platform selection supportFred Baksik2018-07-112-0/+15
| | | |
| * | | GHS: Add toolset selection supportFred Baksik2018-07-115-120/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Use the specified toolset located within GHS_TOOLSET_ROOT -- Update how the latest toolset is determined; scan the location GHS_TOOLSET_ROOT and sort it No longer use registry settings looking for installations The registry values are assigned in installation order for Green Hills tools not version order -- Update to use gbuild.exe from the proper toolset -- Clarify that CMAKE_MAKE_PROGRAM should not be set by user. -- Detect some toolset changes when regenerating project files This could occur if GHS_TOOLSET_ROOT was changed by user after the initial project generation This could occur if CMAKE_MAKE_PROGRAM was changed at the command line -- Use placeholder values for CMAKE_<LANG>_COMPILER The MULTI build system only uses gbuild to build a project gbuild uses the project file to determine which set of compilers to use based on target platform and architecture because compiler detection is skipped, placeholder values are used so that CMake does not complain
| * | | GHS: Support ARM, PPC, 86 architecturesFred Baksik2018-07-075-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | -- Update -A option to choose target architecture. -- Update commentary about which variables are used to control toolset and target settings -- Remove setting CMAKE_SYSTEM_PROCESSOR because the value is overwritten to be "" by subsequent CMAKE processing
* | | | Merge topic 'option_respects_existing_stack_variable'Brad King2018-07-123-26/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8a7cf85ad option: No CMP077 warnings when both cache and local variable exists Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2203
| * | | | option: No CMP077 warnings when both cache and local variable existsRobert Maynard2018-07-103-26/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we would warn when the local and cache version of a variable exists, but this use case doesn't need a warning as it maintains backwards compatibility.
* | | | | CMake Nightly Date StampKitware Robot2018-07-121-1/+1
| | | | |
* | | | | Merge topic 'file-STRINGS-isprint'Brad King2018-07-111-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b872f5b303 file(STRINGS): Use isprint() to test character type Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2198
| * | | | | file(STRINGS): Use isprint() to test character typeDevin Nakamura2018-07-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the more portable `isprint()` function to test characters rather than using hard-coded hex values. The function is documented by the C++ standard to return non-zero for the exact range of hex values we previously hard-coded, so this should not change behavior.
* | | | | | Merge topic 'implicit-link-CMP0054'Brad King2018-07-111-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a353d10a75 Protect implicit link library extraction with policy CMP0054 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2201
| * | | | | | Protect implicit link library extraction with policy CMP0054Brad King2018-07-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMakeParseImplicitLinkInfo tests arbitrary content with `if(MATCHES)`. Set policy CMP0054 to ensure the line content is never interpreted as a variable reference (which may also produce a CMP0054 warning). While at it, also set policy CMP0053 to improve performance.
* | | | | | | Merge topic 'update-kwsys'Brad King2018-07-111-6/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c32432a80 Merge branch 'upstream-KWSys' into update-kwsys 3599b31474 KWSys 2018-07-10 (51982681) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2200
| * \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-07-101-6/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-07-10 (51982681)
| | * | | | | | KWSys 2018-07-10 (51982681)KWSys Upstream2018-07-101-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 5198268138295f67c567c04f4cb0c0f3fdfebef4 (master). Upstream Shortlog ----------------- Brad King (1): aebe4597 XL: Restore suppression of infinite loop warning in process test
* | | | | | | | 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
| | | | | | | | |
generated by cgit v0.12 at 2025-01-21 17:30:51 (GMT)