Skip to content

Commit 9d9ae38

Browse files
daveh-lunargrpavlik
daveh-lunarg
authored and
rpavlik
committed
Add folder properties to all targets
1 parent 9792054 commit 9d9ae38

File tree

11 files changed

+50
-19
lines changed

11 files changed

+50
-19
lines changed

‎CMakeLists.txt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,13 @@ project(OPENXR)
2424

2525
# Enable IDE GUI folders. "Helper targets" that don't have interesting source code should set their FOLDER property to this
2626
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
27-
set(LOADER_HELPER_FOLDER "Helper Targets")
28-
set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "")
27+
set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMake predefined targets")
28+
set(LOADER_FOLDER "Loader")
29+
set(HELPER_FOLDER "Helpers")
30+
set(CODEGEN_FOLDER "Generated")
31+
set(TESTS_FOLDER "Tests")
32+
set(API_LAYERS_FOLDER "Layers")
33+
set(SAMPLES_FOLDER "Samples")
2934

3035
add_subdirectory(include)
3136
add_subdirectory(src)
@@ -37,7 +42,7 @@ if(NOT TARGET uninstall)
3742
IMMEDIATE
3843
@ONLY)
3944
add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
40-
set_target_properties(uninstall PROPERTIES FOLDER ${LOADER_HELPER_FOLDER})
45+
set_target_properties(uninstall PROPERTIES FOLDER ${HELPER_FOLDER})
4146
endif()
4247

4348
find_program(BASH_COMMAND NAMES bash)

‎include/openxr/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ add_custom_target(generate_openxr_header
2828
${CMAKE_CURRENT_BINARY_DIR}/openxr.h
2929
${CMAKE_CURRENT_BINARY_DIR}/openxr_platform.h
3030
)
31+
set_target_properties(generate_openxr_header PROPERTIES FOLDER ${CODEGEN_FOLDER})
32+
3133

3234
# Copy the openxr_platform_defines.h file and place it in the binary (build) directory.
3335
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/openxr_platform_defines.h

‎src/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ add_custom_target(xr_global_generated_files DEPENDS
169169
xr_generated_utilities.h
170170
xr_generated_utilities.c
171171
)
172+
set_target_properties(xr_global_generated_files PROPERTIES FOLDER ${CODEGEN_FOLDER})
173+
172174
run_xr_xml_generate(utility_source_generator.py xr_generated_dispatch_table.h)
173175
run_xr_xml_generate(utility_source_generator.py xr_generated_dispatch_table.c)
174176
run_xr_xml_generate(utility_source_generator.py xr_generated_utilities.h)

‎src/api_layers/CMakeLists.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ add_library(XrApiLayer_api_dump SHARED
4141
${CMAKE_BINARY_DIR}/src/xr_generated_dispatch_table.c
4242
${CMAKE_BINARY_DIR}/src/api_layers/xr_generated_api_dump.cpp
4343
)
44+
set_target_properties(XrApiLayer_api_dump PROPERTIES FOLDER ${API_LAYERS_FOLDER})
45+
4446
add_dependencies(XrApiLayer_api_dump
4547
generate_openxr_header
4648
xr_global_generated_files
@@ -69,6 +71,8 @@ add_library(XrApiLayer_core_validation SHARED
6971
${CMAKE_BINARY_DIR}/src/xr_generated_dispatch_table.c
7072
${CMAKE_BINARY_DIR}/src/api_layers/xr_generated_core_validation.cpp
7173
)
74+
set_target_properties(XrApiLayer_core_validation PROPERTIES FOLDER ${API_LAYERS_FOLDER})
75+
7276
add_dependencies(XrApiLayer_core_validation
7377
generate_openxr_header
7478
xr_global_generated_files
@@ -109,6 +113,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
109113
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DEF_FILE} ${CMAKE_CURRENT_BINARY_DIR}/XrApiLayer_api_dump.def
110114
VERBATIM
111115
)
116+
set_target_properties(copy-api_dump-def-file PROPERTIES FOLDER ${HELPER_FOLDER})
117+
112118
gen_xr_layer_json(
113119
${CMAKE_CURRENT_BINARY_DIR}/XrApiLayer_api_dump.json
114120
api_dump
@@ -129,6 +135,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
129135
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DEF_FILE} ${CMAKE_CURRENT_BINARY_DIR}/XrApiLayer_core_validation.def
130136
VERBATIM
131137
)
138+
set_target_properties(copy-core_validation-def-file PROPERTIES FOLDER ${HELPER_FOLDER})
132139
gen_xr_layer_json(
133140
${CMAKE_CURRENT_BINARY_DIR}/XrApiLayer_core_validation.json
134141
core_validation
@@ -208,24 +215,30 @@ add_custom_target(api_dump_gen_files DEPENDS
208215
xr_generated_api_dump.hpp
209216
xr_generated_api_dump.cpp
210217
)
218+
set_target_properties(api_dump_gen_files PROPERTIES FOLDER ${CODEGEN_FOLDER})
219+
211220
run_xr_xml_generate(api_dump_generator.py xr_generated_api_dump.hpp)
212221
run_xr_xml_generate(api_dump_generator.py xr_generated_api_dump.cpp)
213222

214223
add_custom_target(api_dump_json_file DEPENDS
215224
${CMAKE_CURRENT_BINARY_DIR}/XrApiLayer_api_dump.json
216225
)
226+
set_target_properties(api_dump_json_file PROPERTIES FOLDER ${CODEGEN_FOLDER})
217227

218228
# Final bits for core_validation API Layer
219229
add_custom_target(core_validation_gen_files DEPENDS
220230
xr_generated_core_validation.hpp
221231
xr_generated_core_validation.cpp
222232
)
233+
set_target_properties(core_validation_gen_files PROPERTIES FOLDER ${CODEGEN_FOLDER})
234+
223235
run_xr_xml_generate(validation_layer_generator.py xr_generated_core_validation.hpp)
224236
run_xr_xml_generate(validation_layer_generator.py xr_generated_core_validation.cpp)
225237

226238
add_custom_target(core_validation_json_file DEPENDS
227239
${CMAKE_CURRENT_BINARY_DIR}/XrApiLayer_core_validation.json
228240
)
241+
set_target_properties(core_validation_json_file PROPERTIES FOLDER ${CODEGEN_FOLDER})
229242

230243
# Install explicit layers on Linux
231244
set(TARGET_NAMES

‎src/external/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ add_custom_target(jsoncppAmalgamatedFiles
2424
${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp/dist/json/json.h
2525
${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp/dist/json/json-forwards.h
2626
)
27+
set_target_properties(jsoncppAmalgamatedFiles PROPERTIES FOLDER ${CODEGEN_FOLDER})
2728

2829
# Command to satisfy the amalgamated file dependencies
2930
add_custom_command(

‎src/loader/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ add_library(${LOADER_NAME} ${LIBRARY_TYPE}
7979
${LOADER_EXTERNAL_GEN_FILES}
8080
${openxr_loader_RESOURCE_FILE}
8181
)
82+
set_target_properties(${LOADER_NAME} PROPERTIES FOLDER ${LOADER_FOLDER})
83+
8284
set_source_files_properties(
8385
${LOADER_EXTERNAL_GEN_FILES}
8486
PROPERTIES GENERATED TRUE

‎src/tests/hello_xr/CMakeLists.txt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ add_executable(hello_xr
2626
${LOCAL_SOURCE}
2727
${LOCAL_HEADERS}
2828
${VULKAN_SHADERS})
29+
set_target_properties(hello_xr PROPERTIES FOLDER ${SAMPLES_FOLDER})
2930

3031
source_group("Headers" FILES ${LOCAL_HEADERS})
31-
set_target_properties (hello_xr PROPERTIES FOLDER Shaders)
3232
source_group("Shaders" FILES ${VULKAN_SHADERS})
3333

3434
# Find glslc shader compiler.
@@ -69,6 +69,8 @@ function(compile_glsl)
6969
run_glsl_compiles ALL
7070
DEPENDS ${glsl_output_files}
7171
)
72+
set_target_properties(run_glsl_compiles PROPERTIES FOLDER ${HELPER_FOLDER})
73+
7274
endfunction()
7375

7476
compile_glsl(${VULKAN_SHADERS})
@@ -121,7 +123,3 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
121123
endif()
122124
target_sources(hello_xr PRIVATE ${WAYLAND_PROTOCOL_SRC})
123125
endif()
124-
125-
set_target_properties(hello_xr
126-
PROPERTIES FOLDER tests_hello_xr
127-
)

‎src/tests/list/CMakeLists.txt‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
# Author:
1616
#
1717

18-
add_executable(list
18+
add_executable(runtime_list
1919
list.cpp
2020
)
21-
add_dependencies(list
21+
add_dependencies(runtime_list
2222
generate_openxr_header
2323
)
24-
target_include_directories(list
24+
target_include_directories(runtime_list
2525
PRIVATE ${CMAKE_SOURCE_DIR}/src
2626
PRIVATE ${CMAKE_SOURCE_DIR}/src/common
2727
PRIVATE ${CMAKE_BINARY_DIR}/include
2828
PRIVATE ${CMAKE_SOURCE_DIR}/external/include
2929
)
3030
if(VulkanHeaders_FOUND)
31-
target_include_directories(list
31+
target_include_directories(runtime_list
3232
PRIVATE ${VulkanHeaders_INCLUDE_DIRS}
3333
)
3434
endif()
@@ -40,16 +40,14 @@ else()
4040
endif()
4141

4242
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
43-
target_compile_options(list PRIVATE /Zc:wchar_t /Zc:forScope /W4 /WX)
44-
target_link_libraries(list ${OPENXR_LIB} opengl32)
43+
target_compile_options(runtime_list PRIVATE /Zc:wchar_t /Zc:forScope /W4 /WX)
44+
target_link_libraries(runtime_list ${OPENXR_LIB} opengl32)
4545
endif()
4646

4747
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
48-
target_compile_options(list PRIVATE -Wall)
49-
target_link_libraries(list ${OPENXR_LIB} m pthread GL ${XLIB_LIBRARIES} ${XCB_LIBRARIES} ${WAYLAND_LIBRARIES})
48+
target_compile_options(runtime_list PRIVATE -Wall)
49+
target_link_libraries(runtime_list ${OPENXR_LIB} m pthread GL ${XLIB_LIBRARIES} ${XCB_LIBRARIES} ${WAYLAND_LIBRARIES})
5050
endif()
5151

52-
set_target_properties(list
53-
PROPERTIES FOLDER tests_loader
54-
)
52+
set_target_properties(runtime_list PROPERTIES FOLDER ${TESTS_FOLDER})
5553

‎src/tests/loader_test/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ add_executable(loader_test
2222
${CMAKE_SOURCE_DIR}/src/common/filesystem_utils.cpp
2323
${WAYLAND_PROTOCOL_SRC}
2424
)
25+
set_target_properties(loader_test PROPERTIES FOLDER ${TESTS_FOLDER})
26+
2527
add_dependencies(loader_test
2628
generate_openxr_header
2729
)

‎src/tests/loader_test/test_layers/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ endforeach(OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES)
2929
add_library(XrApiLayer_test SHARED
3030
layer_test.cpp
3131
)
32+
set_target_properties(XrApiLayer_test PROPERTIES FOLDER ${TESTS_FOLDER})
33+
3234
add_dependencies(XrApiLayer_test
3335
xr_global_generated_files
3436
generate_openxr_header
@@ -63,6 +65,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
6365
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DEF_FILE} ${CMAKE_CURRENT_BINARY_DIR}/XrApiLayer_test.def
6466
VERBATIM
6567
)
68+
set_target_properties(copy-test-def-file PROPERTIES FOLDER ${HELPER_FOLDER})
6669
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
6770
target_compile_options(XrApiLayer_test PRIVATE -Wpointer-arith -Wno-unused-function -Wno-sign-compare)
6871
set_target_properties(XrApiLayer_test PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic,--exclude-libs,ALL")
@@ -79,4 +82,5 @@ endif()
7982
add_custom_target(generated_layer_json_files DEPENDS
8083
${CMAKE_BINARY_DIR}/src/tests/loader_test/resources/layers/XrApiLayer_test.json
8184
)
85+
set_target_properties(generated_layer_json_files PROPERTIES FOLDER ${CODEGEN_FOLDER})
8286

0 commit comments

Comments
 (0)