commit dcd604ee621e191acf9e91faab8e47507184d7e9
author Brad King <brad.king@kitware.com> Wed Apr 14 14:46:49 2021 -0400
committer Brad King <brad.king@kitware.com> Wed Apr 14 14:57:03 2021 -0400
tree 34c28e027233944caff804127d1e9fa0aae48642
parent 98ef6632d9f7de15472246ccde76a749be0d37ca

Find{BLAS,LAPACK}: Make library variable names more robust

Modules/FindBLAS.cmake

diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 61e92c9..c23e41b 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -235,20 +235,21 @@
       # Respect linker flags as-is (required by MKL)
       list(APPEND _libraries "${_library}")
     else()
-      set(_combined_name ${_combined_name}_${_library})
+      string(REGEX REPLACE "[^A-Za-z0-9]" "_" _lib_var "${_library}")
+      set(_combined_name ${_combined_name}_${_lib_var})
       if(NOT "${_deps}" STREQUAL "")
         set(_combined_name ${_combined_name}_deps)
       endif()
       if(_libraries_work)
-        find_library(${_prefix}_${_library}_LIBRARY
+        find_library(${_prefix}_${_lib_var}_LIBRARY
           NAMES ${_library}
           NAMES_PER_DIR
           PATHS ${_extaddlibdir}
           PATH_SUFFIXES ${_subdirs}
         )
-        mark_as_advanced(${_prefix}_${_library}_LIBRARY)
-        list(APPEND _libraries ${${_prefix}_${_library}_LIBRARY})
-        set(_libraries_work ${${_prefix}_${_library}_LIBRARY})
+        mark_as_advanced(${_prefix}_${_lib_var}_LIBRARY)
+        list(APPEND _libraries ${${_prefix}_${_lib_var}_LIBRARY})
+        set(_libraries_work ${${_prefix}_${_lib_var}_LIBRARY})
       endif()
     endif()
   endforeach()

Modules/FindLAPACK.cmake

diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index 11bd411..d89c40d 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -217,20 +217,21 @@
       # Respect linker flags as-is (required by MKL)
       list(APPEND _libraries "${_library}")
     else()
-      set(_combined_name ${_combined_name}_${_library})
+      string(REGEX REPLACE "[^A-Za-z0-9]" "_" _lib_var "${_library}")
+      set(_combined_name ${_combined_name}_${_lib_var})
       if(NOT "${_deps}" STREQUAL "")
         set(_combined_name ${_combined_name}_deps)
       endif()
       if(_libraries_work)
-        find_library(${_prefix}_${_library}_LIBRARY
+        find_library(${_prefix}_${_lib_var}_LIBRARY
           NAMES ${_library}
           NAMES_PER_DIR
           PATHS ${_extaddlibdir}
           PATH_SUFFIXES ${_subdirs}
         )
-        mark_as_advanced(${_prefix}_${_library}_LIBRARY)
-        list(APPEND _libraries ${${_prefix}_${_library}_LIBRARY})
-        set(_libraries_work ${${_prefix}_${_library}_LIBRARY})
+        mark_as_advanced(${_prefix}_${_lib_var}_LIBRARY)
+        list(APPEND _libraries ${${_prefix}_${_lib_var}_LIBRARY})
+        set(_libraries_work ${${_prefix}_${_lib_var}_LIBRARY})
       endif()
     endif()
   endforeach()