diff options
| author | Fred Baksik <frodak17@gmail.com> | 2019-01-05 16:01:21 (GMT) |
|---|---|---|
| committer | Fred Baksik <frodak17@gmail.com> | 2019-01-16 15:41:15 (GMT) |
| commit | e7825386e2e9e69728e5a5c3dcbc94814bb7cb1c (patch) | |
| tree | 0b5e2d72d945a19acd4db7d68a10ae4c7d6d64e7 /Tests | |
| parent | 447b57a2676b5bb7e9f97b15c9fe5fe7d3817a86 (diff) | |
| download | CMake-e7825386e2e9e69728e5a5c3dcbc94814bb7cb1c.zip CMake-e7825386e2e9e69728e5a5c3dcbc94814bb7cb1c.tar.gz CMake-e7825386e2e9e69728e5a5c3dcbc94814bb7cb1c.tar.bz2 | |
GHS: Cleanup how source files are listed
-- Sort the items of the project files, previously they were unsorted
The layout is similar to Visual Studio projects
-- Do not make a make a tree of directories and projects files
The main project file is in the binary folder
The sub-project files are located in the project object directory
This is similar to the Makefile generator
-- Allow the creation of a single project file
If the variable or target property GHS_NO_SOURCE_GROUP_FILE is set
then all sources will be listed in the main project file
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/GhsMulti/GhsMultiSrcGroups/CMakeLists.txt | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 1bdb6f3..f06bfbf 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2298,7 +2298,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release add_test_GhsMulti_rename_install(SINGLE_EXEC_RENAMED) add_test_GhsMulti_rename_install(EXEC_AND_LIB) add_test_GhsMulti(multiple_source_groups GhsMultiSrcGroups Default "" "") - add_test_GhsMulti(multiple_source_groups_folders GhsMultiSrcGroups Folders "-DCMAKE_FOLDER=ON" "") + add_test_GhsMulti(multiple_source_groups_folders GhsMultiSrcGroups PropFolders "-DTEST_PROP=ON" "") + add_test_GhsMulti(multiple_source_groups_all_folders GhsMultiSrcGroups AllFolders "-DGHS_NO_SOURCE_GROUP_FILE=ON" "") add_test_GhsMulti(unsupported_targets GhsMultiUnsupportedTargets "" "" "") set_tests_properties(GhsMulti.${ghs_config_name}.unsupported_targets PROPERTIES TIMEOUT 15) add_test_GhsMulti(object_library GhsMultiObjectLibrary "" "" "") diff --git a/Tests/GhsMulti/GhsMultiSrcGroups/CMakeLists.txt b/Tests/GhsMulti/GhsMultiSrcGroups/CMakeLists.txt index 5043e7f..a4f84ca 100644 --- a/Tests/GhsMulti/GhsMultiSrcGroups/CMakeLists.txt +++ b/Tests/GhsMulti/GhsMultiSrcGroups/CMakeLists.txt @@ -32,6 +32,9 @@ add_executable(groups standard.h ) +if(TEST_PROP) + set_target_properties(groups PROPERTIES GHS_NO_SOURCE_GROUP_FILE ON) +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 ) |