From f3a508830cd04266f7095f2e85b2b1b27f6dc456 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 28 Feb 2023 23:00:35 +0100 Subject: try to fix ci again --- cmake/opentrack-load-user-settings.cmake | 3 +-- sdk-paths-runner@GNU-Linux.cmake | 2 ++ sdk-paths-runneradmin@GNU-Linux.cmake | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 sdk-paths-runner@GNU-Linux.cmake delete mode 100644 sdk-paths-runneradmin@GNU-Linux.cmake diff --git a/cmake/opentrack-load-user-settings.cmake b/cmake/opentrack-load-user-settings.cmake index 1baf3702..e84384d3 100644 --- a/cmake/opentrack-load-user-settings.cmake +++ b/cmake/opentrack-load-user-settings.cmake @@ -26,8 +26,7 @@ else() set(__sdk_host_os "") endif() -set(__sdk_paths_basename "sdk-paths-${__sdk_username}@${CMAKE_CXX_COMPILER_ID}-${__sdk_host_os}${__sdk_target_os}.cmake") -set(__sdk_paths_filename "${CMAKE_SOURCE_DIR}/${__sdk_paths_basename}") +set(__sdk_paths_filename "${CMAKE_CURRENT_SOURCE_DIR}/${__sdk_paths_basename}") if(EXISTS "${__sdk_paths_filename}") message(STATUS "Loading user settings '${__sdk_paths_basename}'") diff --git a/sdk-paths-runner@GNU-Linux.cmake b/sdk-paths-runner@GNU-Linux.cmake new file mode 100644 index 00000000..df5c6f35 --- /dev/null +++ b/sdk-paths-runner@GNU-Linux.cmake @@ -0,0 +1,2 @@ +set(SDK_WINE ON CACHE BOOL "" FORCE) +set(ENV{PATH} "/usr/lib/wine:$ENV{PATH}") diff --git a/sdk-paths-runneradmin@GNU-Linux.cmake b/sdk-paths-runneradmin@GNU-Linux.cmake deleted file mode 100644 index df5c6f35..00000000 --- a/sdk-paths-runneradmin@GNU-Linux.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set(SDK_WINE ON CACHE BOOL "" FORCE) -set(ENV{PATH} "/usr/lib/wine:$ENV{PATH}") -- cgit v1.2.3