Skip to content

Commit 8f0cbf0

Browse files
committed
try fetching metal-cpp
1 parent 33ede26 commit 8f0cbf0

File tree

3 files changed

+20
-8
lines changed

3 files changed

+20
-8
lines changed

cmake/dependencies/ios.cmake

+10-1
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,22 @@ if (NOT ${libzip_FOUND})
6969
list(APPEND ADDITIONAL_LIB_INCLUDES ${libzip_SOURCE_DIR}/lib ${libzip_BINARY_DIR})
7070
endif()
7171

72+
#=================== Metal-cpp ===================
73+
FetchContent_Declare(
74+
metalcpp
75+
GIT_REPOSITORY https://github.com/briaguya-ai/single-header-metal-cpp.git
76+
GIT_TAG origin/metal-cpp_macOS12_iOS15
77+
)
78+
FetchContent_MakeAvailable(metalcpp)
79+
list(APPEND ADDITIONAL_LIB_INCLUDES ${metalcpp_SOURCE_DIR})
80+
7281
#=================== ImGui ===================
7382
target_sources(ImGui
7483
PRIVATE
7584
${imgui_SOURCE_DIR}/backends/imgui_impl_metal.mm
7685
)
7786

78-
target_include_directories(ImGui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/extern/metal-cpp)
87+
target_include_directories(ImGui PRIVATE ${metalcpp_SOURCE_DIR})
7988
target_compile_definitions(ImGui PUBLIC IMGUI_IMPL_METAL_CPP)
8089

8190
target_link_libraries(ImGui PUBLIC SDL2::SDL2-static SDL2::SDL2main)

cmake/dependencies/mac.cmake

+10-1
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,22 @@ if (NOT ${spdlog_FOUND})
1414
FetchContent_MakeAvailable(spdlog)
1515
endif()
1616

17+
#=================== Metal-cpp ===================
18+
FetchContent_Declare(
19+
metalcpp
20+
GIT_REPOSITORY https://github.com/briaguya-ai/single-header-metal-cpp.git
21+
GIT_TAG origin/metal-cpp_macOS12_iOS15
22+
)
23+
FetchContent_MakeAvailable(metalcpp)
24+
list(APPEND ADDITIONAL_LIB_INCLUDES ${metalcpp_SOURCE_DIR})
25+
1726
#=================== ImGui ===================
1827
target_sources(ImGui
1928
PRIVATE
2029
${imgui_SOURCE_DIR}/backends/imgui_impl_metal.mm
2130
)
2231

23-
target_include_directories(ImGui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/extern/metal-cpp)
32+
target_include_directories(ImGui PRIVATE ${metalcpp_SOURCE_DIR})
2433
target_compile_definitions(ImGui PUBLIC IMGUI_IMPL_METAL_CPP)
2534

2635
find_package(SDL2 REQUIRED)

src/CMakeLists.txt

-6
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,6 @@ endif()
153153
source_group("graphic" FILES ${Source_Files__Graphic})
154154
target_sources(libultraship PRIVATE ${Source_Files__Graphic})
155155

156-
#=================== metal-cpp ===================
157-
158-
if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS")
159-
target_include_directories(libultraship PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../extern/metal-cpp)
160-
endif()
161-
162156
#=================== Packages & Includes ===================
163157

164158
target_include_directories(libultraship

0 commit comments

Comments
 (0)