Skip to content

Commit 29521fb

Browse files
kagurazaka-ayanokagurazaka-ayano
committed
use External rather than FetchContent
1 parent 229fcbf commit 29521fb

5 files changed

Lines changed: 81 additions & 89 deletions

File tree

‎.gitignore‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@ source
99
third_party/lib/libdawn.*
1010
third_party/lib/*.so
1111
third_party/lib/*.dylib
12+
third_party/local/*
1213

1314
# formatter files
1415
.cmake-format.py
1516

16-
# cmake generated files
17-
compile_commands.json
17+
# cmake build directories
1818
out
19+
build
1920

2021
# clangd files
2122
.cache
23+
compile_commands.json
2224

‎CMakeLists.txt‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,44 @@ project(gpu)
33

44
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/webgpu.cmake")
55

6-
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # export compile_commands.json to use with LSP
6+
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # export compile_commands.json to use with
7+
# LSP
78
set(CMAKE_CXX_STANDARD 17)
89
set(CMAKE_CXX_STANDARD_REQUIRED ON)
910

10-
option(USE_LOCAL_LIBS "Use local libraries instead of fetching from the internet" OFF)
11+
option(USE_LOCAL_LIBS
12+
"Use local libraries instead of fetching from the internet" OFF)
1113

1214
# Ensure the build type is set
1315
if(NOT CMAKE_BUILD_TYPE)
14-
set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build: Debug or Release" FORCE)
16+
set(CMAKE_BUILD_TYPE
17+
Release
18+
CACHE STRING "Choose the type of build: Debug or Release" FORCE)
1519
endif()
1620

1721
option(FASTBUILD "Option to enable fast builds" OFF)
1822
if(FASTBUILD)
19-
set(CMAKE_BUILD_TYPE None) # Avoid default flags of predefined build types
20-
set(CMAKE_CXX_FLAGS "-O0")
23+
set(CMAKE_BUILD_TYPE None) # Avoid default flags of predefined build types
24+
set(CMAKE_CXX_FLAGS "-O0")
2125
endif()
2226

2327
option(DEBUG "Option to enable debug flags" OFF)
2428
if(DEBUG)
25-
set(CMAKE_BUILD_TYPE Debug)
26-
set(CMAKE_CXX_FLAGS "-O0 -g")
29+
set(CMAKE_BUILD_TYPE Debug)
30+
set(CMAKE_CXX_FLAGS "-O0 -g")
2731
endif()
2832

2933
if(WIN64)
30-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWEBGPU_BACKEND_DAWN")
34+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWEBGPU_BACKEND_DAWN")
3135
endif()
3236

3337
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/gpu.cmake")
3438

3539
message(STATUS "CMAKE_CURRENT_SOURCE_DIR: ${CMAKE_CURRENT_SOURCE_DIR}")
36-
message(STATUS "Include directories for wgpu: ${CMAKE_CURRENT_SOURCE_DIR}/third_party/headers")
40+
message(
41+
STATUS
42+
"Include directories for wgpu: ${CMAKE_CURRENT_SOURCE_DIR}/third_party/headers"
43+
)
3744

3845
add_library(gpud SHARED gpu.h)
3946
set_target_properties(gpud PROPERTIES LINKER_LANGUAGE CXX)

‎cmake/example.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ set(FILEPATH_PROJECT_ROOT "${PROJECT_ROOT}/${FILENAME}")
1414
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/find_gpu.cmake")
1515

1616
# Check if the file exists in the current directory
17-
find_project_root(${CMAKE_CURRENT_SOURCE_DIR} ${FILEPATH_CURRENT_DIR}
18-
${TARGET_FILE_PATH})
17+
find_project_root(${CMAKE_CURRENT_SOURCE_DIR} ${FILENAME}
18+
TARGET_FILE_PATH)
1919
if("${TARGET_FILE_PATH}" STREQUAL "")
20-
find_project_root(${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_ROOT}
21-
${TARGET_FILE_PATH})
20+
find_project_root(${FILEPATH_CURRENT_DIR} ${FILENAME}
21+
TARGET_FILE_PATH)
2222
if("${TARGET_FILE_PATH}" STREQUAL "")
2323
message(
2424
FATAL_ERROR

‎cmake/gpu.cmake‎

Lines changed: 24 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ set(FILEPATH_PROJECT_ROOT "${PROJECT_ROOT}/${FILENAME}")
99
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/find_gpu.cmake")
1010

1111
# Check if the file exists in the current directory
12-
find_project_root(${CMAKE_CURRENT_SOURCE_DIR} ${FILEPATH_CURRENT_DIR}
13-
${TARGET_FILE_PATH})
12+
find_project_root(${CMAKE_CURRENT_SOURCE_DIR} ${FILENAME} TARGET_FILE_PATH)
1413
if("${TARGET_FILE_PATH}" STREQUAL "")
15-
find_project_root(${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_ROOT}
16-
${TARGET_FILE_PATH})
14+
find_project_root(${FILEPATH_CURRENT_DIR} ${FILENAME} TARGET_FILE_PATH)
1715
if("${TARGET_FILE_PATH}" STREQUAL "")
1816
message(
1917
FATAL_ERROR
@@ -45,49 +43,27 @@ target_include_directories(gpu INTERFACE ${TARGET_FILE_PATH})
4543
# Add headers webgpu.h
4644
target_include_directories(wgpu
4745
INTERFACE ${TARGET_FILE_PATH}/third_party/headers)
48-
# FetchContent_Declare( DAWN_EXT GIT_REPOSITORY
49-
# "https://dawn.googlesource.com/dawn" GIT_TAG "main" INSTALL_DIR
50-
# "${TARGET_FILE_PATH}/third_party/dawn" CONFIGURE_COMMAND "python3
51-
# tools/fetch_dawn_dependencies.py" CMAKE_ARGS "-DDAWN_ENABLE_INSTALL=ON
52-
# -DDAWN_BUILD_MONOLITHIC_LIBRARY=ON -DCMAKE_BUILD_TYPE=Debug
53-
# -DBUILD_SAMPLES=OFF" )
46+
include(ExternalProject)
5447

55-
# FetchContent_MakeAvailable(DAWN_EXT)
48+
set(DAWN_EXT_PREFIX "${TARGET_FILE_PATH}/third_party/local/dawn")
5649

57-
if(WIN32)
58-
set(DLL_PATH
59-
"${TARGET_FILE_PATH}/third_party/lib/libdawn_${ARCH}_${BUILD_TYPE}.dll")
60-
if(EXISTS ${DLL_PATH})
61-
file(COPY ${DLL_PATH} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
62-
target_link_libraries(webgpulib INTERFACE ${DLL_PATH})
63-
else()
64-
message(FATAL_ERROR "libdawn dll not found at: ${DLL_PATH}")
65-
endif()
66-
else()
67-
find_library(LIBDAWN dawn PATHS "${TARGET_FILE_PATH}/third_party/lib")
68-
if(LIBDAWN)
69-
message(STATUS "Found libdawn: ${LIBDAWN}") # Link against libdawn
70-
target_link_libraries(webgpulib INTERFACE ${LIBDAWN})
71-
# if not found, try download from release else()
72-
message("libdawn not found, try downloading from the release")
73-
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
74-
set(libdawn_ext "dylib")
75-
elseif(UNIX)
76-
set(libdawn_ext "so")
77-
endif()
78-
FetchContent_Declare(
79-
libdawn
80-
URL https://github.com/austinvhuang/dawn-artifacts/releases/download/prerelease/libdawn.${libdawn_ext}
81-
DOWNLOAD_NO_EXTRACT TRUE
82-
SOURCE_DIR "${TARGET_FILE_PATH}/third_party/lib")
83-
FetchContent_MakeAvailable(libdawn)
84-
find_library(LIBDAWN dawn REQUIRED
85-
PATHS "${TARGET_FILE_PATH}/third_party/lib")
86-
if(LIBDAWN)
87-
message(STATUS "Found libdawn: ${LIBDAWN}") # Link against libdawn
88-
target_link_libraries(webgpulib INTERFACE ${LIBDAWN})
89-
else()
90-
message(FATAL_ERROR "libdawn not found")
91-
endif()
92-
endif()
93-
endif()
50+
ExternalProject_Add(
51+
dawn_project
52+
PREFIX ${DAWN_EXT_PREFIX}
53+
GIT_REPOSITORY "https://dawn.googlesource.com/dawn"
54+
GIT_TAG "main"
55+
SOURCE_DIR "${DAWN_EXT_PREFIX}/source"
56+
BINARY_DIR "${DAWN_EXT_PREFIX}/build"
57+
INSTALL_DIR "${DAWN_EXT_PREFIX}/install"
58+
GIT_SUBMODULES ""
59+
# setting cmake args doesn't work and I don't know why
60+
CONFIGURE_COMMAND
61+
${CMAKE_COMMAND} -S ${DAWN_EXT_PREFIX}/source -B
62+
${DAWN_EXT_PREFIX}/build -DDAWN_FETCH_DEPENDENCIES=ON
63+
-DDAWN_ENABLE_INSTALL=ON -DDAWN_BUILD_MONOLITHIC_LIBRARY=ON
64+
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -G ${CMAKE_GENERATOR}
65+
INSTALL_COMMAND ${CMAKE_COMMAND} --install . --prefix
66+
${DAWN_EXT_PREFIX}/install
67+
LOG_INSTALL ON)
68+
find_library(LIBDAWN dawn PATHS "${DAWN_EXT_PREFIX}/install/lib")
69+
target_link_libraries(webgpulib INTERFACE ${LIBDAWN})

‎cmake/webgpu.cmake‎

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,47 +8,54 @@ get_filename_component(PROJECT_ROOT ${PROJECT_ROOT} DIRECTORY)
88
set(FILEPATH_CURRENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}")
99
set(FILEPATH_PROJECT_ROOT "${PROJECT_ROOT}/${FILENAME}")
1010

11+
# Include file finding utility script
12+
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/find_gpu.cmake")
13+
1114
# Check if the file exists in the current directory
12-
if(EXISTS ${FILEPATH_CURRENT_DIR})
13-
set(TARGET_FILE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
14-
elseif(EXISTS ${FILEPATH_PROJECT_ROOT})
15-
set(TARGET_FILE_PATH ${PROJECT_ROOT})
16-
else()
17-
message(FATAL_ERROR "File ${FILENAME} not found in either ${CMAKE_CURRENT_SOURCE_DIR} or ${CMAKE_CURRENT_SOURCE_DIR}/../../")
15+
find_project_root(${CMAKE_CURRENT_SOURCE_DIR} ${FILENAME} TARGET_FILE_PATH)
16+
if("${TARGET_FILE_PATH}" STREQUAL "")
17+
find_project_root(${FILEPATH_CURRENT_DIR} ${FILENAME} TARGET_FILE_PATH)
18+
if("${TARGET_FILE_PATH}" STREQUAL "")
19+
message(
20+
FATAL_ERROR
21+
"File ${FILENAME} not found in either ${CMAKE_CURRENT_SOURCE_DIR} or ${CMAKE_CURRENT_SOURCE_DIR}/../../"
22+
)
23+
endif()
1824
endif()
1925

2026
include(FetchContent)
2127

2228
set(FETCHCONTENT_BASE_DIR "${TARGET_FILE_PATH}/third_party/fetchcontent")
23-
set(WEBGPU_DIST_LOCAL_PATH "${TARGET_FILE_PATH}/third_party/local/WebGPU-distribution")
29+
set(WEBGPU_DIST_LOCAL_PATH
30+
"${TARGET_FILE_PATH}/third_party/local/WebGPU-distribution")
2431

2532
if(USE_LOCAL_LIBS)
26-
set(WEBGPU_DIST_GIT_REPO ${WEBGPU_DIST_LOCAL_PATH})
27-
message(STATUS "Using local WebGPU distribution: ${WEBGPU_DIST_LOCAL_PATH}")
33+
set(WEBGPU_DIST_GIT_REPO ${WEBGPU_DIST_LOCAL_PATH})
34+
message(STATUS "Using local WebGPU distribution: ${WEBGPU_DIST_LOCAL_PATH}")
2835
else()
29-
set(WEBGPU_DIST_GIT_REPO "https://github.com/eliemichel/WebGPU-distribution")
36+
set(WEBGPU_DIST_GIT_REPO
37+
"https://github.com/eliemichel/WebGPU-distribution")
3038
endif()
3139

3240
option(WEBGPU_TAG "WebGPU distribution tag to use")
33-
if (NOT WEBGPU_TAG)
34-
set(WEBGPU_TAG "dawn")
41+
if(NOT WEBGPU_TAG)
42+
set(WEBGPU_TAG "dawn")
3543
endif()
3644
message(STATUS "Using WebGPU distribution tag: ${WEBGPU_TAG}")
3745

38-
if (WEBGPU_TAG STREQUAL "dawn")
39-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWEBGPU_BACKEND_DAWN")
40-
# use specific commit
41-
# set(WEBGPU_TAG "1025b977e1927b6d0327e67352f90feb4bcf8274")
42-
# set(WEBGPU_TAG "acf972b7b909f52e183bdae3971b93bb13d4a29e")
43-
# add_compile_options(-UABSL_INTERNAL_AT_LEAST_CXX20)
44-
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -UABSL_INTERNAL_AT_LEAST_CXX20")
45-
message(STATUS "Using Dawn backend")
46+
if(WEBGPU_TAG STREQUAL "dawn")
47+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWEBGPU_BACKEND_DAWN")
48+
# use specific commit set(WEBGPU_TAG
49+
# "1025b977e1927b6d0327e67352f90feb4bcf8274") set(WEBGPU_TAG
50+
# "acf972b7b909f52e183bdae3971b93bb13d4a29e")
51+
# add_compile_options(-UABSL_INTERNAL_AT_LEAST_CXX20) set(CMAKE_CXX_FLAGS
52+
# "${CMAKE_CXX_FLAGS} -UABSL_INTERNAL_AT_LEAST_CXX20")
53+
message(STATUS "Using Dawn backend")
4654
endif()
4755

4856
FetchContent_Declare(
49-
webgpu
50-
GIT_REPOSITORY ${WEBGPU_DIST_GIT_REPO}
51-
GIT_TAG ${WEBGPU_TAG}
52-
GIT_SHALLOW TRUE
53-
)
54-
FetchContent_MakeAvailable(webgpu)
57+
webgpu
58+
GIT_REPOSITORY ${WEBGPU_DIST_GIT_REPO}
59+
GIT_TAG ${WEBGPU_TAG}
60+
GIT_SHALLOW TRUE)
61+
FetchContent_MakeAvailable(webgpu)

0 commit comments

Comments
 (0)