diff options
| author | Fred Baksik <frodak17@gmail.com> | 2019-01-09 04:52:12 (GMT) |
|---|---|---|
| committer | Fred Baksik <frodak17@gmail.com> | 2019-01-16 15:42:08 (GMT) |
| commit | 21ab58d3f8782e80145f14eb6e72926c9d17afc6 (patch) | |
| tree | 04b73d0d54cc854bedc8641aa5b7f73677362088 /Tests/GhsMulti/GhsMultiSrcGroups | |
| parent | 72e0c115b771fe9e3f4b5a5b6bd3bcdade77a7cb (diff) | |
| download | CMake-21ab58d3f8782e80145f14eb6e72926c9d17afc6.zip CMake-21ab58d3f8782e80145f14eb6e72926c9d17afc6.tar.gz CMake-21ab58d3f8782e80145f14eb6e72926c9d17afc6.tar.bz2 | |
GHS: Update test suite
-- Allow for testing default toolset settings
If CMake_TEST_GreenHillsMULTI_config is not defined then
just run the GHS tests using defaults.
-- Handle paths that contain spaces
-- Update test suite to use "-non_shared" linker option
Fixes linking issue if GHS is not shipped with shared libraries
-- Other minor cleanup
Diffstat (limited to 'Tests/GhsMulti/GhsMultiSrcGroups')
| -rw-r--r-- | Tests/GhsMulti/GhsMultiSrcGroups/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/GhsMulti/GhsMultiSrcGroups/cmake.rule | 2 | ||||
| -rw-r--r-- | Tests/GhsMulti/GhsMultiSrcGroups/object.o | 2 | ||||
| -rw-r--r-- | Tests/GhsMulti/GhsMultiSrcGroups/resource.pdf | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/Tests/GhsMulti/GhsMultiSrcGroups/CMakeLists.txt b/Tests/GhsMulti/GhsMultiSrcGroups/CMakeLists.txt index a4f84ca..93a1afc 100644 --- a/Tests/GhsMulti/GhsMultiSrcGroups/CMakeLists.txt +++ b/Tests/GhsMulti/GhsMultiSrcGroups/CMakeLists.txt @@ -35,6 +35,9 @@ add_executable(groups if(TEST_PROP) set_target_properties(groups PROPERTIES GHS_NO_SOURCE_GROUP_FILE ON) endif() +if(CMAKE_C_COMPILER_ID MATCHES "GHS") + target_link_options(groups PRIVATE "-non_shared") +endif() source_group( gC FILES sub/testOBJ.h testOBJ.c testOBJ.h sub/testOBJ.c ) source_group( gA FILES test1.c test1.h) source_group( gB test[65].c ) diff --git a/Tests/GhsMulti/GhsMultiSrcGroups/cmake.rule b/Tests/GhsMulti/GhsMultiSrcGroups/cmake.rule index 8b13789..c6cac69 100644 --- a/Tests/GhsMulti/GhsMultiSrcGroups/cmake.rule +++ b/Tests/GhsMulti/GhsMultiSrcGroups/cmake.rule @@ -1 +1 @@ - +empty diff --git a/Tests/GhsMulti/GhsMultiSrcGroups/object.o b/Tests/GhsMulti/GhsMultiSrcGroups/object.o index 8b13789..c6cac69 100644 --- a/Tests/GhsMulti/GhsMultiSrcGroups/object.o +++ b/Tests/GhsMulti/GhsMultiSrcGroups/object.o @@ -1 +1 @@ - +empty diff --git a/Tests/GhsMulti/GhsMultiSrcGroups/resource.pdf b/Tests/GhsMulti/GhsMultiSrcGroups/resource.pdf index 8b13789..e69de29 100644 --- a/Tests/GhsMulti/GhsMultiSrcGroups/resource.pdf +++ b/Tests/GhsMulti/GhsMultiSrcGroups/resource.pdf @@ -1 +0,0 @@ - |