3rd: glm

Signed-off-by: Zone.N <Zone.Niuzh@hotmail.com>
Simple-XX · Nov 7, 2023 · eae637b · eae637b
1 parent 7cef114
commit eae637b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -48,7 +48,7 @@ jobs:
         run: |
           sudo apt update
           sudo apt install --fix-missing -y doxygen graphviz clang-format clang-tidy cppcheck lcov
-          sudo apt install --fix-missing -y gcc g++ libspdlog-dev libcgal-dev freeglut3-dev libboost-all-dev libvtk9-dev qtbase5-dev xorg-dev libglu1-mesa-dev
+          sudo apt install --fix-missing -y gcc g++ libspdlog-dev libcgal-dev freeglut3-dev libboost-all-dev libvtk9-dev qtbase5-dev xorg-dev libglu1-mesa-dev libglm-dev
 
       - name: Build
         run: |
@@ -69,7 +69,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          brew install doxygen graphviz llvm cppcheck lcov spdlog boost freeglut glfw vtk cgal
+          brew install doxygen graphviz llvm cppcheck lcov spdlog boost freeglut glfw vtk cgal glm
           ln -s "$(brew --prefix llvm)/bin/clang-format" "/usr/local/bin/clang-format"
           ln -s "$(brew --prefix llvm)/bin/clang-tidy" "/usr/local/bin/clang-tidy"
 

diff --git a/cmake/3rd.cmake b/cmake/3rd.cmake
@@ -81,15 +81,6 @@ CPMAddPackage(
         "GLFW_BULID_DOCS OFF"
 )
 
-# https://github.com/g-truc/glm
-set(gRPC_INSTALL ON CACHE BOOL "")
-set(gRPC_BUILD_TESTS OFF CACHE BOOL "")
-CPMAddPackage(
-        NAME glm
-        GITHUB_REPOSITORY g-truc/glm
-        GIT_TAG 0.9.9.8
-)
-
 # https://github.com/TheLartians/PackageProject.cmake
 CPMAddPackage("gh:TheLartians/PackageProject.cmake@1.11.0")
 
@@ -228,3 +219,10 @@ if (NOT VTK_FOUND)
     message(FATAL_ERROR "VTK not found.\n"
             "Following https://vtk.org/ to install.")
 endif ()
+
+find_package(glm REQUIRED)
+if (NOT glm_FOUND)
+    message(FATAL_ERROR "glm not found.\n"
+            "Following https://vtk.org/ to install.")
+endif ()
+# target_link_libraries(<your executable> glm::glm)
diff --git a/deps.md b/deps.md
@@ -1,11 +1,11 @@
 
 ubuntu
 ```shell
-sudo apt install -y doxygen graphviz clang-format clang-tidy cppcheck lcov gcc g++ libspdlog-dev libcgal-dev freeglut3-dev libboost-all-dev libvtk9-dev qtbase5-dev xorg-dev libglu1-mesa-dev
+sudo apt install -y doxygen graphviz clang-format clang-tidy cppcheck lcov gcc g++ libspdlog-dev libcgal-dev freeglut3-dev libboost-all-dev libvtk9-dev qtbase5-dev xorg-dev libglu1-mesa-dev libglm-dev
 ```
 
 osx
 ```shell
-brew install doxygen graphviz llvm cppcheck lcov spdlog freeglut boost glfw vtk cgal
+brew install doxygen graphviz llvm cppcheck lcov spdlog freeglut boost glfw vtk cgal glm
 
 ```