Skip to content

Commit 919309c

Browse files
use install RPATH and PATH variables
1 parent 9114729 commit 919309c

2 files changed

Lines changed: 23 additions & 4 deletions

File tree

CMakePresets.json

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
"binaryDir": "Result.Windows.x64.MultiConfig",
6464
"architecture": "x64",
6565
"cacheVariables": {
66+
"CMAKE_INSTALL_RPATH": "Result.Windows.x64.MultiConfig",
6667
"CMAKE_CONFIGURATION_TYPES": "Debug"
6768
}
6869

@@ -84,6 +85,8 @@
8485
"generator": "Xcode",
8586
"cacheVariables": {
8687
"BUILD_FRAMEWORK": "ON",
88+
"CMAKE_INSTALL_PREFIX": "Result.Darwin.x64.Debug",
89+
"CMAKE_INSTALL_RPATH": "Result.Darwin.x64.Debug",
8790
"CMAKE_CONFIGURATION_TYPES": "Debug"
8891
}
8992
},
@@ -94,6 +97,8 @@
9497
"binaryDir": "Result.Darwin.x64.Release",
9598
"cacheVariables": {
9699
"CMAKE_BUILD_TYPE": "Release",
100+
"CMAKE_INSTALL_PREFIX": "Result.Darwin.x64.Release",
101+
"CMAKE_INSTALL_RPATH": "Result.Darwin.x64.Release",
97102
"CMAKE_CONFIGURATION_TYPES": "Release"
98103
}
99104
},
@@ -102,22 +107,34 @@
102107
"name": "Darwin_arm64_Debug",
103108
"inherits": "Darwin_x64_Debug",
104109
"binaryDir": "Result.Darwin.arm64.Debug",
105-
"displayName": "Darwin ARM XCode Debug"
110+
"displayName": "Darwin ARM XCode Debug",
111+
"cacheVariables": {
112+
"CMAKE_INSTALL_PREFIX": "Result.Darwin.arm64.Debug",
113+
"CMAKE_INSTALL_RPATH": "Result.Darwin.arm64.Debug"
114+
}
106115
},
107116

108117
{
109118
"name": "Darwin_arm64_Release",
110119
"inherits": "Darwin_x64_Release",
111120
"binaryDir": "Result.Darwin.arm64.Release",
112-
"displayName": "Darwin ARM XCode Release"
121+
"displayName": "Darwin ARM XCode Release",
122+
"cacheVariables": {
123+
"CMAKE_INSTALL_PREFIX": "Result.Darwin.arm64.Debug",
124+
"CMAKE_INSTALL_RPATH": "Result.Darwin.arm64.Debug"
125+
}
113126
},
114127

115128
{
116129
"name": "Linux_x64_Debug",
117130
"inherits": "BaseOptions",
118131
"displayName": "Linux Ninja Debug",
119132
"binaryDir": "Result.Linux.x64.Debug",
120-
"generator": "Ninja"
133+
"generator": "Ninja",
134+
"cacheVariables": {
135+
"CMAKE_INSTALL_PREFIX": "Result.Linux.x64.Debug",
136+
"CMAKE_INSTALL_RPATH": "Result.Linux.x64.Debug"
137+
}
121138
},
122139
{
123140
"name": "Linux_x64_Release",
@@ -126,6 +143,8 @@
126143
"binaryDir": "Result.Linux.x64.Release",
127144
"generator": "Ninja",
128145
"cacheVariables": {
146+
"CMAKE_INSTALL_PREFIX": "Result.Linux.x64.Release",
147+
"CMAKE_INSTALL_RPATH": "Result.Linux.x64.Release",
129148
"CMAKE_BUILD_TYPE": "Release"
130149
}
131150
}

dependencies.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ FetchContent_MakeAvailable(
199199
rapidhash
200200
)
201201

202-
find_package(SPIRV-Tools-opt CONFIG)
202+
#find_package(SPIRV-Tools-opt CONFIG)
203203

204204
set(IMGUIDIR ${FETCHCONTENT_BASE_DIR}/imgui)
205205

0 commit comments

Comments
 (0)