From aee4921eb3047a62c2e4f9ba621a35b4176e51de Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sun, 9 Apr 2023 15:32:47 -0400 Subject: [PATCH] Remove libxiv It's now not used by any tooling, so let's remove it now. --- .gitmodules | 3 --- CMakeLists.txt | 3 +-- extern/CMakeLists.txt | 16 +++++++++------- libxiv | 1 - 4 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 .gitmodules delete mode 160000 libxiv diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 267cdaa..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "libxiv"] - path = libxiv - url = ../libxiv diff --git a/CMakeLists.txt b/CMakeLists.txt index 75272b4..9c89178 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.25) project(Novus) set(CMAKE_AUTOMOC ON) @@ -6,8 +7,6 @@ set(CMAKE_CXX_STANDARD 17) find_package(Qt5 COMPONENTS Core Widgets CONFIG REQUIRED) -add_subdirectory(libxiv) - include(FetchContent) add_subdirectory(extern) diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 3989b32..19b495f 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -1,18 +1,20 @@ FetchContent_Declare( Corrosion GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git - GIT_TAG v0.2.2 + GIT_TAG v0.3.5 ) FetchContent_MakeAvailable(Corrosion) -FetchContent_Declare( - libphysis - GIT_REPOSITORY https://git.sr.ht/~redstrate/libphysis - GIT_TAG 0.1.1 -) +#FetchContent_Declare( +# libphysis +# GIT_REPOSITORY https://git.sr.ht/~redstrate/libphysis +# GIT_TAG 0.1.3 +#) -FetchContent_MakeAvailable(libphysis) +#FetchContent_MakeAvailable(libphysis) + +set(libphysis_SOURCE_DIR /home/josh/Development/libphysis) corrosion_import_crate(MANIFEST_PATH ${libphysis_SOURCE_DIR}/Cargo.toml) diff --git a/libxiv b/libxiv deleted file mode 160000 index 0860547..0000000 --- a/libxiv +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0860547c54368ab135f6c189d134501635b20b06