OSGeo · HuidaeCho · Feb 22, 2025 · Jan 2, 2023 · Jan 2, 2023 · Jan 2, 2023
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -120,8 +120,8 @@ option(WITH_NLS "Build with NLS support" ${nls_default_option_enabled})
 
 # Computing options
 option(WITH_FFTW "Build with FFTW support" ON)
-option(WITH_BLAS "Build with BLAS support" ON)
-option(WITH_LAPACK "Build with LAPACK support" ON)
+option(WITH_CBLAS "Build with CBLAS support" ON)
+option(WITH_LAPACKE "Build with LAPACKE support" ON)
 option(WITH_OPENMP "Build with OpenMP support" ON)
 
 # Data format options

diff --git a/cmake/modules/CheckDependentLibraries.cmake b/cmake/modules/CheckDependentLibraries.cmake
@@ -256,28 +256,39 @@ if(WIN32)
   set(BLA_PREFER_PKGCONFIG ON)
   set(BLA_PKGCONFIG_BLAS "openblas")
   set(BLA_PKGCONFIG_LAPACK "openblas")
-endif()
-
-if(WITH_BLAS)
-  find_package(BLAS REQUIRED)
-  if(BLAS_FOUND)
-    add_library(BLAS INTERFACE IMPORTED GLOBAL)
-    set_property(TARGET BLAS PROPERTY INTERFACE_LINK_LIBRARIES
-                                      ${BLAS_LIBRARIES})
-    set_property(TARGET BLAS PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-                                      ${BLAS_INCLUDE_DIRS})
+else()
+  set(BLA_PKGCONFIG_BLAS "blas-netlib")
+  set(BLA_PKGCONFIG_LAPACK "lapacke")
+endif()
+
+if(WITH_CBLAS)
+  # find_package(CBLAS CONFIG REQUIRED)
+  pkg_check_modules(CBLAS QUIET ${BLA_PKGCONFIG_BLAS})
+  if (CBLAS_FOUND)
+    add_library(CBLAS INTERFACE IMPORTED GLOBAL)
+    set_property(TARGET CBLAS PROPERTY INTERFACE_LINK_LIBRARIES
+                                      ${CBLAS_LIBRARIES})
+    set_property(TARGET CBLAS PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+                                      ${CBLAS_INCLUDEDIR})
   endif()
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(CBLAS REQUIRED_VARS CBLAS_LIBRARIES
+                                    CBLAS_INCLUDEDIR)
+
 endif()
 
-if(WITH_LAPACK)
-  find_package(LAPACK REQUIRED)
-  if(LAPACK_FOUND)
-    add_library(LAPACK INTERFACE IMPORTED GLOBAL)
-    set_property(TARGET LAPACK PROPERTY INTERFACE_LINK_LIBRARIES
-                                        ${LAPACK_LIBRARIES})
-    set_property(TARGET LAPACK PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-                                        ${LAPACK_INCLUDE_DIRS})
+if(WITH_LAPACKE)
+  # find_package(LAPACKE CONFIG REQUIRED)
+  pkg_check_modules(LAPACKE QUIET ${BLA_PKGCONFIG_LAPACK})
+  if(LAPACKE_FOUND)
+    add_library(LAPACKE INTERFACE IMPORTED GLOBAL)
+    set_property(TARGET LAPACKE PROPERTY INTERFACE_LINK_LIBRARIES
+                                        ${LAPACKE_LIBRARIES})
+    set_property(TARGET LAPACKE PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+                                        ${LAPACKE_INCLUDEDIR})
   endif()
+  find_package_handle_standard_args(LAPACKE REQUIRED_VARS LAPACKE_LIBRARIES
+                                    LAPACKE_INCLUDEDIR)
 endif()
 
 if(WITH_OPENMP)
@@ -379,10 +390,10 @@ check_target(FREETYPE HAVE_FT2BUILD_H)
 # set(CMAKE_REQUIRED_INCLUDES "${FFTW_INCLUDE_DIR}") no target ATLAS in
 # thirdpary/CMakeLists.txt
 check_target(ATLAS HAVE_LIBATLAS)
-check_target(BLAS HAVE_LIBBLAS)
-check_target(BLAS HAVE_CBLAS_H)
-check_target(LAPACK HAVE_LIBLAPACK)
-check_target(LAPACK HAVE_CLAPACK_H)
+check_target(CBLAS HAVE_LIBBLAS)
+check_target(CBLAS HAVE_CBLAS_H)
+check_target(LAPACKE HAVE_LIBLAPACK)
+check_target(LAPACKE HAVE_CLAPACK_H)
 check_target(TIFF HAVE_TIFFIO_H)
 check_target(NETCDF HAVE_NETCDF)
 check_target(GEOS HAVE_GEOS)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -32,8 +32,8 @@ build_library_in_subdir(
   grass_gproj
   grass_parson)
 
-if(TARGET LAPACK)
-  target_link_libraries(grass_raster PRIVATE LAPACK)
+if(TARGET LAPACKE)
+  target_link_libraries(grass_raster PRIVATE LAPACKE)
 endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -58,8 +58,8 @@ build_library_in_subdir(
   "${use_math_DEFS}"
   OPTIONAL_DEPENDS
   FFTW
-  LAPACK
-  BLAS
+  LAPACKE
+  CBLAS
   OPENMP)
 
 build_library_in_subdir(linkm)

diff --git a/lib/vector/CMakeLists.txt b/lib/vector/CMakeLists.txt
@@ -29,8 +29,8 @@ if(TARGET POSTGRES)
   target_link_libraries(grass_vector PRIVATE POSTGRES)
 endif()
 
-if(TARGET LAPACK)
-  target_link_libraries(grass_vector PRIVATE LAPACK)
+if(TARGET LAPACKE)
+  target_link_libraries(grass_vector PRIVATE LAPACKE)
 endif()
 
 build_library_in_subdir(