diff options
| author | Brad King <brad.king@kitware.com> | 2018-07-12 13:14:58 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-07-12 13:15:18 (GMT) |
| commit | f6f5f9f75f809a077ac3f451745904d9f3faaa85 (patch) | |
| tree | c8e4c761c44df04b3dde3833a48b357ded131797 /Tests | |
| parent | 7b04ad61cf925161c8b7f9abf6ef3db047118807 (diff) | |
| parent | ce4f20ba62a3c7e0dd78cffc1669a400311f057e (diff) | |
| download | CMake-f6f5f9f75f809a077ac3f451745904d9f3faaa85.zip CMake-f6f5f9f75f809a077ac3f451745904d9f3faaa85.tar.gz CMake-f6f5f9f75f809a077ac3f451745904d9f3faaa85.tar.bz2 | |
Merge topic 'ghs'
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
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 9200579..7ea5c04 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2260,7 +2260,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release --build-generator "Green Hills MULTI" --build-project ReturnNum --build-config $<CONFIGURATION> - --build-options -DGHS_PRIMARY_TARGET="arm_integrity.tgt" + --build-options -DGHS_PRIMARY_TARGET=arm_integrity.tgt -DGHS_BSP_NAME="simarm" ) endif () |