The open source OpenXR runtime
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

external: Sort libraries in CMakeLists.txt and meson.build

authored by

Jakob Bornecrantz and committed by
Jakob Bornecrantz
af540f5e d3b22427

+13 -8
+12 -7
src/external/CMakeLists.txt
··· 1 1 # Copyright 2020, Collabora, Ltd. 2 2 # SPDX-License-Identifier: BSL-1.0 3 3 4 - add_library(xrt-external-openxr INTERFACE) 5 - target_include_directories(xrt-external-openxr INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/openxr_includes) 4 + # Catch2 5 + add_library(xrt-external-catch2 INTERFACE) 6 + target_include_directories(xrt-external-catch2 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/Catch2) 6 7 7 - add_library(xrt-external-glad INTERFACE) 8 - target_include_directories(xrt-external-glad INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/glad/include) 9 - 8 + # cJSON 10 9 add_library(xrt-external-cjson INTERFACE) 11 10 if(XRT_HAVE_SYSTEM_CJSON) 12 11 target_link_libraries(xrt-external-cjson INTERFACE cJSON::cJSON) ··· 14 13 target_include_directories(xrt-external-cjson INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/cjson) 15 14 endif() 16 15 16 + # FlexKalman 17 17 add_library(xrt-external-flexkalman INTERFACE) 18 18 target_include_directories(xrt-external-flexkalman INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/flexkalman) 19 19 20 - add_library(xrt-external-catch2 INTERFACE) 21 - target_include_directories(xrt-external-catch2 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/Catch2) 20 + # Glad 21 + add_library(xrt-external-glad INTERFACE) 22 + target_include_directories(xrt-external-glad INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/glad/include) 23 + 24 + # OpenXR 25 + add_library(xrt-external-openxr INTERFACE) 26 + target_include_directories(xrt-external-openxr INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/openxr_includes)
+1 -1
src/external/meson.build
··· 1 1 # Copyright 2019-2020, Collabora, Ltd. 2 2 # SPDX-License-Identifier: BSL-1.0 3 3 4 - openxr_include = include_directories('openxr_includes') 5 4 cjson_include = include_directories('cjson') 6 5 flexkalman_include = include_directories('flexkalman') 7 6 glad_include = include_directories('glad/include') 8 7 imgui_include = include_directories('imgui') 8 + openxr_include = include_directories('openxr_includes')