Moved workaround for GLM 0.9.9 broken glmTargets.cmake to covise_find_package so that it is also applied in findCOVER.cmake

Author: hpcdgrie

cmake/CoviseHelperMacros.cmake

@@ -1116,7 +1116,13 @@ MACRO(COVISE_FIND_PACKAGE package)
        #message("CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}")
    endif (NOT COVISE_ARCHSUFFIX MATCHES "^spack")
    FIND_PACKAGE(${ARGV})
-
+   if(pack STREQUAL glm AND NOT TARGET glm::glm AND GLM_INCLUDE_DIRS)
+      # Workaround for GLM 0.9.9 broken glmTargets.cmake
+      add_library(glm::glm INTERFACE IMPORTED)
+      set_target_properties(glm::glm PROPERTIES
+          INTERFACE_INCLUDE_DIRECTORIES "${GLM_INCLUDE_DIRS}"
+      )
+   endif()
    SET(CMAKE_PREFIX_PATH ${SAVED_CMAKE_PREFIX_PATH})
    if (APPLE)
        if (pack STREQUAL "OpenGL" OR pack STREQUAL "GLUT")

src/OpenCOVER/audio/CMakeLists.txt

@@ -2,14 +2,6 @@ covise_find_package(glm)
 covise_find_package(OpenAL)
 covise_find_package(ALUT)
 
-# Workaround for GLM 0.9.9 broken glmTargets.cmake
-if(NOT TARGET glm::glm AND GLM_INCLUDE_DIRS)
-    add_library(glm::glm INTERFACE IMPORTED)
-    set_target_properties(glm::glm PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${GLM_INCLUDE_DIRS}"
-    )
-endif()
-
 # glm: allow .xyz() and similar access
 add_definitions(-DGLM_FORCE_SWIZZLE -DGLM_ENABLE_EXPERIMENTAL)