diff --git a/.gitmodules b/.gitmodules index 732411d4..1c26c90d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -312,11 +312,6 @@ path = mmesh/mmesh url = https://github.com/BRL-CAD/mmesh.git ignore = dirty -[submodule "glm/glm"] - path = glm/glm - url = https://github.com/BRL-CAD/glm.git - branch = RELEASE - ignore = dirty [submodule "clipper2/Clipper2"] path = clipper2/Clipper2 url = https://github.com/BRL-CAD/Clipper2.git diff --git a/dependencies.cmake b/dependencies.cmake index 6e85b625..58e967a2 100644 --- a/dependencies.cmake +++ b/dependencies.cmake @@ -177,11 +177,6 @@ add_project(linenoise GROUPS "BRLCAD") # https://github.com/LMDB/lmdb add_project(lmdb GROUPS "BRLCAD") -# GLM - header only C++ mathematics library for graphics software based on the -# OpenGL Shading Language (GLSL) specifications -# https://github.com/g-truc/glm -add_project(glm GROUPS "BRLCAD") - # Eigen - linear algebra library # https://eigen.tuxfamily.org add_project(eigen GROUPS "BRLCAD;APPLESEED") diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt deleted file mode 100644 index 11c8e763..00000000 --- a/glm/CMakeLists.txt +++ /dev/null @@ -1,52 +0,0 @@ -# Decide if we're using glm -cad_enable(GLM "librt") - -bext_enable(GLM) - -# Decision made - -if (ENABLE_GLM) - - git_submodule_init(glm readme.md) - - RegisterDeps(GLM) - - ExternalProject_Add(GLM_BLD - URL "${CMAKE_CURRENT_SOURCE_DIR}/glm" - BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS} - #PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/glm.patch - CMAKE_ARGS - ${BUILD_TYPE_SPECIFIER} - -DBIN_DIR=${BIN_DIR} - -DLIB_DIR=${LIB_DIR} - -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_INSTALL_PREFIX=${CMAKE_BUNDLE_INSTALL_PREFIX} - -DCMAKE_INSTALL_LIBDIR:PATH=${LIB_DIR} - -DCMAKE_INSTALL_RPATH=${CMAKE_BUNDLE_INSTALL_PREFIX}/${LIB_DIR} - LOG_CONFIGURE ${EXT_BUILD_QUIET} - LOG_BUILD ${EXT_BUILD_QUIET} - LOG_INSTALL ${EXT_BUILD_QUIET} - LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET} - STEP_TARGETS install - ) - - TargetInstallDeps(GLM GLM_DEPENDS) - - # Copy the license into position in CMAKE_BUNDLE_INSTALL_PREFIX - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/glm_mit.txt - ${DOC_LICENSE_DIR}/glm.txt - COPYONLY - ) - -endif (ENABLE_GLM) - -# Local Variables: -# tab-width: 8 -# mode: cmake -# indent-tabs-mode: t -# End: -# ex: shiftwidth=2 tabstop=8 - diff --git a/glm/glm b/glm/glm deleted file mode 160000 index 0af55cce..00000000 --- a/glm/glm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0af55ccecd98d4e5a8d1fad7de25ba429d60e863 diff --git a/glm/glm.deps b/glm/glm.deps deleted file mode 100644 index ecdeab5f..00000000 --- a/glm/glm.deps +++ /dev/null @@ -1,2 +0,0 @@ -PATCH - diff --git a/glm/glm_mit.txt b/glm/glm_mit.txt deleted file mode 100644 index 221e3df6..00000000 --- a/glm/glm_mit.txt +++ /dev/null @@ -1,28 +0,0 @@ -================================================================================ -OpenGL Mathematics (GLM) --------------------------------------------------------------------------------- -GLM is licensed under The Happy Bunny License or MIT License. BRL-CAD uses the -standard MIT license: - -================================================================================ -The MIT License --------------------------------------------------------------------------------- -Copyright (c) 2005 - G-Truc Creation - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE.