diff --git a/.gitmodules b/.gitmodules index 7d1344b6..01c87956 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "3rdparty/nanoflann"] path = 3rdparty/nanoflann url = https://github.com/jlblancoc/nanoflann.git -[submodule "3rdparty/glm"] - path = 3rdparty/glm - url = https://github.com/g-truc/glm.git [submodule "3rdparty/eigen3-nnls"] path = 3rdparty/eigen3-nnls url = https://github.com/hmatuschek/eigen3-nnls.git diff --git a/3rdparty/glm b/3rdparty/glm deleted file mode 160000 index efec5db0..00000000 --- a/3rdparty/glm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit efec5db081e3aad807d0731e172ac597f6a39447 diff --git a/CMakeLists.txt b/CMakeLists.txt index bb434fa2..791a2807 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,6 @@ message(STATUS "Eigen3 include dir found at ${EIGEN3_INCLUDE_DIR}") # Set the include directories of the 3rd-party submodules that we use: set(CEREAL_INCLUDE_DIR "${eos_3RDPARTY_DIR}/cereal/include") -set(glm_INCLUDE_DIR "${eos_3RDPARTY_DIR}/glm") set(nanoflann_INCLUDE_DIR "${eos_3RDPARTY_DIR}/nanoflann/include") set(eigen3_nnls_INCLUDE_DIR "${eos_3RDPARTY_DIR}/eigen3-nnls/src") set(toml11_INCLUDE_DIR "${eos_3RDPARTY_DIR}/toml11") @@ -136,7 +135,6 @@ target_compile_features(eos INTERFACE ${EOS_CXX_COMPILE_FEATURES}) target_include_directories(eos INTERFACE "include") target_include_directories(eos INTERFACE ${CEREAL_INCLUDE_DIR}) target_include_directories(eos INTERFACE ${EIGEN3_INCLUDE_DIR}) -target_include_directories(eos INTERFACE ${glm_INCLUDE_DIR}) target_include_directories(eos INTERFACE ${nanoflann_INCLUDE_DIR}) target_include_directories(eos INTERFACE ${eigen3_nnls_INCLUDE_DIR}) target_include_directories(eos INTERFACE ${toml11_INCLUDE_DIR}) @@ -162,8 +160,6 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include) # ou install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/share/ DESTINATION share) # the model and metadata # For 3rd party headers, we only copy the headers and licence files: install(DIRECTORY ${eos_3RDPARTY_DIR}/cereal/ DESTINATION 3rdparty/cereal) # cereal headers -install(DIRECTORY ${eos_3RDPARTY_DIR}/glm/glm/ DESTINATION 3rdparty/glm/glm) # glm headers -install(FILES ${eos_3RDPARTY_DIR}/glm/copying.txt DESTINATION 3rdparty/glm/) # glm licence install(DIRECTORY ${eos_3RDPARTY_DIR}/nanoflann/include/ DESTINATION 3rdparty/nanoflann/include) # nanoflann header install(FILES ${eos_3RDPARTY_DIR}/nanoflann/COPYING DESTINATION 3rdparty/nanoflann/) # nanoflann licence install(DIRECTORY ${eos_3RDPARTY_DIR}/eigen3-nnls/src/ DESTINATION 3rdparty/eigen3-nnls/src) # eigen3-nnls header