Changed more deps to use FetchContent
This commit is contained in:
9
.gitmodules
vendored
9
.gitmodules
vendored
@ -1,15 +1,6 @@
|
|||||||
[submodule "lib/glfw"]
|
|
||||||
path = lib/glfw
|
|
||||||
url = https://github.com/glfw/glfw.git
|
|
||||||
[submodule "lib/openal-soft"]
|
[submodule "lib/openal-soft"]
|
||||||
path = lib/openal-soft
|
path = lib/openal-soft
|
||||||
url = https://github.com/kcat/openal-soft
|
url = https://github.com/kcat/openal-soft
|
||||||
[submodule "lib/AudioFile"]
|
[submodule "lib/AudioFile"]
|
||||||
path = lib/AudioFile
|
path = lib/AudioFile
|
||||||
url = https://github.com/adamstark/AudioFile.git
|
url = https://github.com/adamstark/AudioFile.git
|
||||||
[submodule "lib/freetype"]
|
|
||||||
path = lib/freetype
|
|
||||||
url = https://gitlab.freedesktop.org/freetype/freetype.git
|
|
||||||
[submodule "lib/libarchive"]
|
|
||||||
path = lib/libarchive
|
|
||||||
url = https://github.com/libarchive/libarchive
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
include(FetchContent)
|
include(FetchContent)
|
||||||
|
|
||||||
# add_subdirectory(glm)
|
# GLM
|
||||||
FetchContent_Declare(
|
FetchContent_Declare(
|
||||||
glm
|
glm
|
||||||
GIT_REPOSITORY https://github.com/g-truc/glm.git
|
GIT_REPOSITORY https://github.com/g-truc/glm.git
|
||||||
@ -13,20 +13,25 @@ FetchContent_Declare(
|
|||||||
)
|
)
|
||||||
FetchContent_MakeAvailable(glm)
|
FetchContent_MakeAvailable(glm)
|
||||||
|
|
||||||
if(DAWN_TARGET STREQUAL "linux-x64-glfw")
|
|
||||||
add_subdirectory(glad)
|
|
||||||
add_subdirectory(glfw)
|
|
||||||
add_subdirectory(libarchive)
|
|
||||||
add_subdirectory(freetype)
|
|
||||||
else()
|
|
||||||
message(FATAL_ERROR "Unknown target: ${DAWN_TARGET}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# JSON
|
# JSON
|
||||||
|
|
||||||
FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz)
|
FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz)
|
||||||
FetchContent_MakeAvailable(json)
|
FetchContent_MakeAvailable(json)
|
||||||
|
|
||||||
|
# GLAD
|
||||||
|
add_subdirectory(glad)
|
||||||
|
|
||||||
|
# GLFW
|
||||||
|
FetchContent_Declare(glfw URL https://github.com/glfw/glfw/releases/download/3.4/glfw-3.4.zip)
|
||||||
|
FetchContent_MakeAvailable(glfw)
|
||||||
|
|
||||||
|
# LibArchive
|
||||||
|
FetchContent_Declare(libarchive URL https://github.com/libarchive/libarchive/releases/download/v3.7.6/libarchive-3.7.6.tar.xz)
|
||||||
|
FetchContent_MakeAvailable(libarchive)
|
||||||
|
|
||||||
|
# FreeType
|
||||||
|
FetchContent_Declare(freetype URL https://psychz.dl.sourceforge.net/project/freetype/freetype2/2.13.3/freetype-2.13.3.tar.xz?viasf=1)
|
||||||
|
FetchContent_MakeAvailable(freetype)
|
||||||
|
|
||||||
# if(DAWN_TARGET_OPENAL)
|
# if(DAWN_TARGET_OPENAL)
|
||||||
# set(LIBTYPE "STATIC")
|
# set(LIBTYPE "STATIC")
|
||||||
# add_subdirectory(openal-soft)
|
# add_subdirectory(openal-soft)
|
||||||
|
1
lib/SDL
1
lib/SDL
Submodule lib/SDL deleted from fb1497566c
Submodule lib/freetype deleted from 7ff43d3e9f
1
lib/glfw
1
lib/glfw
Submodule lib/glfw deleted from b35641f4a3
Submodule lib/libarchive deleted from 313aa1fa10
Reference in New Issue
Block a user