Remove Eigen and fmt submodules
parent
cb8c1e8f03
commit
499e115a70
|
@ -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"]
|
[submodule "thirdparty/Spice"]
|
||||||
path = thirdparty/Spice
|
path = thirdparty/Spice
|
||||||
url = https://github.com/OpenSpace/Spice
|
url = https://github.com/OpenSpace/Spice
|
||||||
|
|
|
@ -233,23 +233,12 @@ find_package(Libepoxy REQUIRED)
|
||||||
link_libraries(libepoxy::libepoxy)
|
link_libraries(libepoxy::libepoxy)
|
||||||
include_directories(${LIBEPOXY_INCLUDE_DIR})
|
include_directories(${LIBEPOXY_INCLUDE_DIR})
|
||||||
|
|
||||||
find_package(Eigen3 3.3 NO_MODULE) # -DEigen3_DIR=...
|
find_package(Eigen3 3.3 REQUIRED NO_MODULE) # -DEigen3_DIR=...
|
||||||
if(TARGET Eigen3::Eigen)
|
message(STATUS "Found Eigen3 ${EIGEN3_VERSION_STRING}")
|
||||||
message(STATUS "Found Eigen3 ${EIGEN3_VERSION_STRING}")
|
link_libraries(Eigen3::Eigen)
|
||||||
link_libraries(Eigen3::Eigen)
|
|
||||||
else()
|
|
||||||
message(STATUS "Using Eigen submodule")
|
|
||||||
include_directories("${CMAKE_SOURCE_DIR}/thirdparty/Eigen")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
find_package(fmt 4.0.0 CONFIG QUIET)
|
find_package(fmt REQUIRED)
|
||||||
if(fmt_FOUND)
|
link_libraries(fmt::fmt)
|
||||||
link_libraries(fmt::fmt)
|
|
||||||
else()
|
|
||||||
message(STATUS "Using fmt submodule")
|
|
||||||
add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/fmt")
|
|
||||||
link_libraries(fmt::fmt)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
find_package(PNG REQUIRED)
|
find_package(PNG REQUIRED)
|
||||||
add_definitions(${PNG_DEFINITIONS})
|
add_definitions(${PNG_DEFINITIONS})
|
||||||
|
|
|
@ -33,7 +33,8 @@ steps:
|
||||||
libgtkglext1-dev \
|
libgtkglext1-dev \
|
||||||
libfreetype6-dev \
|
libfreetype6-dev \
|
||||||
libsdl2-dev \
|
libsdl2-dev \
|
||||||
libluajit-5.1-dev
|
libluajit-5.1-dev \
|
||||||
|
libfmt-dev
|
||||||
displayName: 'Install Linux dependencies'
|
displayName: 'Install Linux dependencies'
|
||||||
condition: eq( variables['Agent.OS'], 'Linux' )
|
condition: eq( variables['Agent.OS'], 'Linux' )
|
||||||
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 29b0b219552712556d8898d8c016c4e0bbda886f
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 3e75ad9822980e41bc591938f26548f24eb88907
|
|
Loading…
Reference in New Issue