+5 -1

CMakeLists.txt

reviewed

··· 2 2 # SPDX-License-Identifier: BSL-1.0 3 3 4 4 cmake_minimum_required(VERSION 3.10.2) 5 5 - project(XRT VERSION 21.0.0) 5 5 + project( 6 6 + XRT 7 7 + VERSION 21.0.0 8 8 + LANGUAGES C CXX 9 9 + ) 6 10 7 11 # CMake 3.11 introduced CMP0072 - Prefer GLVND 8 12 if(POLICY CMP0072)

+9 -8

src/xrt/targets/openxr/active_runtime.cmake

reviewed

··· 1 1 # Copyright 2019, Benjamin Saunders <ben.e.saunders@gmail.com> 2 2 + # Copyright 2019-2023, Collabora, Ltd. 2 3 # SPDX-License-Identifier: BSL-1.0 3 3 - 4 4 - include(GNUInstallDirs) 5 4 6 5 set(MANIFEST_RELATIVE_DIR @MANIFEST_RELATIVE_DIR@) 7 6 set(XR_API_MAJOR @XR_API_MAJOR@) 8 7 set(RUNTIME_TARGET @RUNTIME_TARGET@) 8 8 + set(CURRENT_BIN_DIR @CMAKE_CURRENT_BINARY_DIR@) 9 9 + set(CMAKE_INSTALL_SYSCONFDIR @CMAKE_INSTALL_SYSCONFDIR@) 9 10 10 10 - execute_process(COMMAND ${CMAKE_COMMAND} -E rm -f ${CMAKE_BINARY_DIR}/active_runtime.json) 11 11 + execute_process(COMMAND "${CMAKE_COMMAND}" -E rm -f "${CURRENT_BIN_DIR}/active_runtime.json") 11 12 execute_process( 12 13 COMMAND 13 13 - ${CMAKE_COMMAND} -E create_symlink 14 14 - ${CMAKE_INSTALL_PREFIX}/${MANIFEST_RELATIVE_DIR}/${RUNTIME_TARGET}.json 15 15 - ${CMAKE_BINARY_DIR}/active_runtime.json 14 14 + "${CMAKE_COMMAND}" -E create_symlink 15 15 + "${CMAKE_INSTALL_PREFIX}/${MANIFEST_RELATIVE_DIR}/${RUNTIME_TARGET}.json" 16 16 + "${CURRENT_BIN_DIR}/active_runtime.json" 16 17 ) 17 18 file( 18 19 INSTALL 19 19 - DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/openxr/${XR_API_MAJOR}" 20 20 - TYPE FILE FILES "${CMAKE_BINARY_DIR}/active_runtime.json" 20 20 + DESTINATION "/${CMAKE_INSTALL_SYSCONFDIR}/xdg/openxr/${XR_API_MAJOR}" 21 21 + TYPE FILE FILES "${CURRENT_BIN_DIR}/active_runtime.json" 21 22 )