diff --git a/.gitmodules b/.gitmodules index 6ee59177d..930870448 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,3 @@ -[submodule "thirdparty/Eigen"] - path = thirdparty/Eigen - url = https://github.com/eigenteam/eigen-git-mirror - branch = branches/3.3 -[submodule "thirdparty/fmt"] - path = thirdparty/fmt - url = https://github.com/fmtlib/fmt [submodule "thirdparty/Spice"] path = thirdparty/Spice url = https://github.com/OpenSpace/Spice diff --git a/CMakeLists.txt b/CMakeLists.txt index 63bc5d009..407c78423 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -233,23 +233,12 @@ find_package(Libepoxy REQUIRED) link_libraries(libepoxy::libepoxy) include_directories(${LIBEPOXY_INCLUDE_DIR}) -find_package(Eigen3 3.3 NO_MODULE) # -DEigen3_DIR=... -if(TARGET Eigen3::Eigen) - message(STATUS "Found Eigen3 ${EIGEN3_VERSION_STRING}") - link_libraries(Eigen3::Eigen) -else() - message(STATUS "Using Eigen submodule") - include_directories("${CMAKE_SOURCE_DIR}/thirdparty/Eigen") -endif() +find_package(Eigen3 3.3 REQUIRED NO_MODULE) # -DEigen3_DIR=... +message(STATUS "Found Eigen3 ${EIGEN3_VERSION_STRING}") +link_libraries(Eigen3::Eigen) -find_package(fmt 4.0.0 CONFIG QUIET) -if(fmt_FOUND) - link_libraries(fmt::fmt) -else() - message(STATUS "Using fmt submodule") - add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/fmt") - link_libraries(fmt::fmt) -endif() +find_package(fmt REQUIRED) +link_libraries(fmt::fmt) find_package(PNG REQUIRED) add_definitions(${PNG_DEFINITIONS}) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dbf4acf5c..fe0ff7f7a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,7 +33,8 @@ steps: libgtkglext1-dev \ libfreetype6-dev \ libsdl2-dev \ - libluajit-5.1-dev + libluajit-5.1-dev \ + libfmt-dev displayName: 'Install Linux dependencies' condition: eq( variables['Agent.OS'], 'Linux' ) diff --git a/thirdparty/Eigen b/thirdparty/Eigen deleted file mode 160000 index 29b0b2195..000000000 --- a/thirdparty/Eigen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 29b0b219552712556d8898d8c016c4e0bbda886f diff --git a/thirdparty/fmt b/thirdparty/fmt deleted file mode 160000 index 3e75ad982..000000000 --- a/thirdparty/fmt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3e75ad9822980e41bc591938f26548f24eb88907