diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-22 13:22:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-03-22 13:22:44 (GMT) |
| commit | 89abbdd8c8db5bf587373f2a00f6a816eddd8496 (patch) | |
| tree | 815aaa6b4a54b6782bfb30550a20cfa6e4ee8ccb /Tests | |
| parent | 4e47e9967aa9d4cd76375468e3b175cd313f3877 (diff) | |
| parent | 2c43fb5be345b75d12bba227979efd74b810b49a (diff) | |
| download | CMake-89abbdd8c8db5bf587373f2a00f6a816eddd8496.zip CMake-89abbdd8c8db5bf587373f2a00f6a816eddd8496.tar.gz CMake-89abbdd8c8db5bf587373f2a00f6a816eddd8496.tar.bz2 | |
Merge topic 'ghs-linux'
2c43fb5be3 FindThreads: Fix pthread library check in GHS Multi Generator
0404efe786 GHS: Add support for GHS Multi Generator in Linux
2060a1445c Tests: Fix file name case in GHS object library test
ddad70c8a4 Tests: Run GHS tests in a separate ctest process
f7dca1fc97 GHS: Fix include-what-you-use and clang-tidy diagnostics
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3006
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/GhsMulti/GhsMultiObjectLibrary/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index d793adf..3746965 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2324,6 +2324,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release --build-generator "Green Hills MULTI" --build-project test --build-config $<CONFIGURATION> + --force-new-ctest-process --build-options ${ghs_target_arch} ${ghs_toolset_name} ${ghs_toolset_root} ${ghs_target_platform} ${ghs_os_root} ${ghs_os_dir} ${ghs_bsp_name} ${_ghs_build_opts} ${_ghs_toolset_extra} ${_ghs_test_command} diff --git a/Tests/GhsMulti/GhsMultiObjectLibrary/CMakeLists.txt b/Tests/GhsMulti/GhsMultiObjectLibrary/CMakeLists.txt index a025814..98668e5c 100644 --- a/Tests/GhsMulti/GhsMultiObjectLibrary/CMakeLists.txt +++ b/Tests/GhsMulti/GhsMultiObjectLibrary/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.12 FATAL_ERROR) project(test C) -add_library(obj1 OBJECT testObj.c testObj.h sub/testObj.c testObj2.c) +add_library(obj1 OBJECT testOBJ.c testOBJ.h sub/testOBJ.c testOBJ2.c) add_executable(exe1 exe.c $<TARGET_OBJECTS:obj1>) if(CMAKE_C_COMPILER_ID STREQUAL "GHS") |