Skip to content

Commit 6f225c8

Browse files
MathewBensonMathewBenson
committed
make static and use RPATH
1 parent 4076bef commit 6f225c8

File tree

3 files changed

+24
-30
lines changed

3 files changed

+24
-30
lines changed

‎CMakePresets.json‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
"cacheVariables": {
8787
"BUILD_FRAMEWORK": "ON",
8888
"CMAKE_INSTALL_PREFIX": "Result.Darwin.x64.Debug",
89-
"CMAKE_INSTALL_RPATH": "Result.Darwin.x64.Debug",
9089
"CMAKE_CONFIGURATION_TYPES": "Debug"
9190
}
9291
},
@@ -98,7 +97,6 @@
9897
"cacheVariables": {
9998
"CMAKE_BUILD_TYPE": "Release",
10099
"CMAKE_INSTALL_PREFIX": "Result.Darwin.x64.Release",
101-
"CMAKE_INSTALL_RPATH": "Result.Darwin.x64.Release",
102100
"CMAKE_CONFIGURATION_TYPES": "Release"
103101
}
104102
},
@@ -109,8 +107,7 @@
109107
"binaryDir": "Result.Darwin.arm64.Debug",
110108
"displayName": "Darwin ARM XCode Debug",
111109
"cacheVariables": {
112-
"CMAKE_INSTALL_PREFIX": "Result.Darwin.arm64.Debug",
113-
"CMAKE_INSTALL_RPATH": "Result.Darwin.arm64.Debug"
110+
"CMAKE_INSTALL_PREFIX": "Result.Darwin.arm64.Debug"
114111
}
115112
},
116113

@@ -120,8 +117,7 @@
120117
"binaryDir": "Result.Darwin.arm64.Release",
121118
"displayName": "Darwin ARM XCode Release",
122119
"cacheVariables": {
123-
"CMAKE_INSTALL_PREFIX": "Result.Darwin.arm64.Debug",
124-
"CMAKE_INSTALL_RPATH": "Result.Darwin.arm64.Debug"
120+
"CMAKE_INSTALL_PREFIX": "Result.Darwin.arm64.Debug"
125121
}
126122
},
127123

@@ -132,8 +128,7 @@
132128
"binaryDir": "Result.Linux.x64.Debug",
133129
"generator": "Ninja",
134130
"cacheVariables": {
135-
"CMAKE_INSTALL_PREFIX": "Result.Linux.x64.Debug",
136-
"CMAKE_INSTALL_RPATH": "Result.Linux.x64.Debug"
131+
"CMAKE_INSTALL_PREFIX": "Result.Linux.x64.Debug"
137132
}
138133
},
139134
{
@@ -144,7 +139,6 @@
144139
"generator": "Ninja",
145140
"cacheVariables": {
146141
"CMAKE_INSTALL_PREFIX": "Result.Linux.x64.Release",
147-
"CMAKE_INSTALL_RPATH": "Result.Linux.x64.Release",
148142
"CMAKE_BUILD_TYPE": "Release"
149143
}
150144
}

‎Obelisk/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ target_link_libraries(${TARGET_NAME} PRIVATE
4747
imported::External_obeliskLibs
4848
)
4949

50-
set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PATH}/bin/Editor)
50+
set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin/Editor)
5151

5252
install(DIRECTORY ../Resources/Editor DESTINATION bin)
5353

5454
install(TARGETS ${TARGET_NAME}
5555
RUNTIME DESTINATION bin/Editor
5656
)
5757

58-
install(IMPORTED_RUNTIME_ARTIFACTS Vulkan::Loader glfw
58+
install(IMPORTED_RUNTIME_ARTIFACTS ${TARGET_NAME} vulkan
5959
DESTINATION bin/Editor
6060
)
6161

‎dependencies.cmake‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FetchContent_Declare(
44
fmt
55
GIT_REPOSITORY https://github.com/fmtlib/fmt.git
66
GIT_SHALLOW TRUE
7-
FIND_PACKAGE_ARGS CONFIG
7+
#FIND_PACKAGE_ARGS CONFIG
88
)
99

1010
FetchContent_Declare(
@@ -34,44 +34,44 @@ FetchContent_Declare(
3434
glfw3
3535
GIT_REPOSITORY https://github.com/glfw/glfw.git
3636
GIT_SHALLOW TRUE
37-
FIND_PACKAGE_ARGS CONFIG
37+
#FIND_PACKAGE_ARGS CONFIG
3838
)
3939

4040
FetchContent_Declare(
4141
spdlog
4242
GIT_REPOSITORY https://github.com/gabime/spdlog.git
4343
GIT_SHALLOW TRUE
4444
GIT_TAG v1.15.3
45-
FIND_PACKAGE_ARGS CONFIG
45+
#FIND_PACKAGE_ARGS CONFIG
4646
)
4747

4848
FetchContent_Declare(
4949
EnTT
5050
GIT_REPOSITORY https://github.com/skypjack/entt.git
5151
GIT_SHALLOW TRUE
52-
FIND_PACKAGE_ARGS CONFIG
52+
#FIND_PACKAGE_ARGS CONFIG
5353
)
5454

5555
FetchContent_Declare(
5656
assimp
5757
GIT_REPOSITORY https://github.com/assimp/assimp.git
5858
GIT_TAG v5.3.0
5959
GIT_SHALLOW TRUE
60-
FIND_PACKAGE_ARGS CONFIG
60+
#FIND_PACKAGE_ARGS CONFIG
6161
)
6262

6363
FetchContent_Declare(
6464
stduuid
6565
GIT_REPOSITORY https://github.com/mariusbancila/stduuid.git
6666
GIT_SHALLOW TRUE
67-
FIND_PACKAGE_ARGS CONFIG
67+
#FIND_PACKAGE_ARGS CONFIG
6868
)
6969

7070
FetchContent_Declare(
7171
yaml-cpp
7272
GIT_REPOSITORY https://github.com/jbeder/yaml-cpp
7373
GIT_SHALLOW TRUE
74-
FIND_PACKAGE_ARGS CONFIG
74+
#FIND_PACKAGE_ARGS CONFIG
7575
)
7676

7777

@@ -80,23 +80,23 @@ FetchContent_Declare(
8080
GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Cross.git
8181
GIT_TAG vulkan-sdk-1.3.296
8282
GIT_SHALLOW TRUE
83-
FIND_PACKAGE_ARGS CONFIG
83+
#FIND_PACKAGE_ARGS CONFIG
8484
)
8585

8686
FetchContent_Declare(
8787
VulkanMemoryAllocator
8888
GIT_REPOSITORY
8989
https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
9090
GIT_SHALLOW TRUE
91-
FIND_PACKAGE_ARGS CONFIG
91+
#FIND_PACKAGE_ARGS CONFIG
9292
)
9393

9494
FetchContent_Declare(
9595
SPIRV-Headers
9696
GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Headers.git
9797
GIT_SHALLOW TRUE
9898
GIT_TAG main
99-
FIND_PACKAGE_ARGS CONFIG
99+
#FIND_PACKAGE_ARGS CONFIG
100100
)
101101

102102
FetchContent_Declare(
@@ -105,7 +105,7 @@ FetchContent_Declare(
105105
GIT_SHALLOW TRUE
106106
GIT_TAG main-tot
107107
SOURCE_DIR "${FETCHCONTENT_BASE_DIR}/glslang"
108-
FIND_PACKAGE_ARGS CONFIG
108+
#FIND_PACKAGE_ARGS CONFIG
109109
)
110110

111111

@@ -114,7 +114,7 @@ FetchContent_Declare(
114114
GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Tools.git
115115
GIT_SHALLOW TRUE
116116
GIT_TAG main
117-
FIND_PACKAGE_ARGS CONFIG
117+
#FIND_PACKAGE_ARGS CONFIG
118118
)
119119

120120

@@ -123,22 +123,22 @@ Fetchcontent_Declare(
123123
GIT_REPOSITORY https://github.com/google/googletest.git
124124
GIT_SHALLOW TRUE
125125
GIT_TAG main
126-
FIND_PACKAGE_ARGS CONFIG
126+
#FIND_PACKAGE_ARGS CONFIG
127127
)
128128

129129
Fetchcontent_Declare(
130130
nlohmann_json
131131
GIT_REPOSITORY https://github.com/nlohmann/json.git
132132
GIT_SHALLOW TRUE
133-
FIND_PACKAGE_ARGS CONFIG
133+
#FIND_PACKAGE_ARGS CONFIG
134134
)
135135

136136
Fetchcontent_Declare(
137137
tlsf
138138
GIT_REPOSITORY https://github.com/mattconte/tlsf
139139
GIT_SHALLOW TRUE
140140
SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/tlsf
141-
FIND_PACKAGE_ARGS CONFIG
141+
#FIND_PACKAGE_ARGS CONFIG
142142
)
143143

144144
Fetchcontent_Declare(
@@ -147,7 +147,7 @@ Fetchcontent_Declare(
147147
GIT_SHALLOW TRUE
148148
GIT_TAG main
149149
SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/CLI11
150-
FIND_PACKAGE_ARGS CONFIG
150+
#FIND_PACKAGE_ARGS CONFIG
151151
)
152152

153153

@@ -156,21 +156,21 @@ Fetchcontent_Declare(
156156
GIT_REPOSITORY https://github.com/Nicoshev/rapidhash
157157
GIT_SHALLOW TRUE
158158
SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/rapidhash
159-
FIND_PACKAGE_ARGS CONFIG
159+
#FIND_PACKAGE_ARGS CONFIG
160160
)
161161

162162
FetchContent_Declare(Vulkan-Headers
163163
GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Headers
164164
GIT_SHALLOW TRUE
165165
GIT_TAG v1.3.296
166-
FIND_PACKAGE_ARGS CONFIG NAMES VulkanHeaders
166+
#FIND_PACKAGE_ARGS CONFIG NAMES VulkanHeaders
167167
)
168168

169169
FetchContent_Declare(Vulkan-Loader
170170
GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Loader
171171
GIT_SHALLOW TRUE
172172
GIT_TAG v1.3.296
173-
FIND_PACKAGE_ARGS CONFIG NAMES VulkanLoader
173+
#FIND_PACKAGE_ARGS CONFIG NAMES VulkanLoader
174174
)
175175

176176

0 commit comments

Comments
 (0)