Try to fix BLAS++ and LAPACK++ installation so that the tests pass

.github/workflows/cmake.yml

@@ -179,7 +179,7 @@ jobs:
       run: |
         sudo apt update
         sudo apt install -y cmake gfortran
-        # sudo apt purge libopenblas-dev liblapack-dev
+        sudo apt purge libopenblas-dev liblapack-dev
 
     - name: Configure CMake
       run: >
@@ -200,8 +200,8 @@ jobs:
       working-directory: ${{github.workspace}}/build
       run: |
         if [[ ${{ matrix.sharedlib }} == 'ON' ]]; then
-          blaspp_blas=$(ldd lib/libblaspp.so | grep libblas.so | { grep -v grep || true; })
-          if [[ -z $blaspp_blas || "$blaspp_blas" != *"${{github.workspace}}/build"* ]]; then
+          blaspp_blas=$(ldd lib/libblaspp.so | grep "${{github.workspace}}/build/lib" | { grep -v grep || true; })
+          if [[ -z $blaspp_blas ]]; then
             echo "BLAS++ dependency to BLAS is not correct!"
             echo "ldd lib/libblaspp.so:"
             ldd lib/libblaspp.so

CMakeLists.txt

@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.11)
+# VERSION 3.11: FetchContent
 
 project(LAPACK Fortran C)
 
@@ -10,6 +11,19 @@ set(
   ${LAPACK_MAJOR_VERSION}.${LAPACK_MINOR_VERSION}.${LAPACK_PATCH_VERSION}
   )
 
+# Dependencies on other projects
+include(FetchContent)
+FetchContent_Declare(
+  blaspp
+  GIT_REPOSITORY https://github.com/icl-utk-edu/blaspp
+  GIT_TAG        f8f983d5b45a8f366aae41fbe9888b14cbae20f8 # v2023.08.25
+)
+FetchContent_Declare(
+  lapackpp
+  GIT_REPOSITORY https://github.com/icl-utk-edu/lapackpp
+  GIT_TAG        62680a16a9aba2a426e3d089dd13e18bfd140c74 # v2023.08.25
+)
+
 # Allow setting a prefix for the library names
 set(CMAKE_STATIC_LIBRARY_PREFIX "lib${LIBRARY_PREFIX}")
 set(CMAKE_SHARED_LIBRARY_PREFIX "lib${LIBRARY_PREFIX}")
@@ -472,38 +486,78 @@ function(_display_cpp_implementation_msg name)
   message(STATUS "For support ${name}++ related question, please email: [email protected]")
   message(STATUS "----------------")
 endfunction()
-if (BLAS++)
-  _display_cpp_implementation_msg("BLAS")
-  include(ExternalProject)
-  ExternalProject_Add(blaspp
-	  URL https://bitbucket.org/icl/blaspp/downloads/blaspp-2020.10.02.tar.gz
-	  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env LIBRARY_PATH=$ENV{LIBRARY_PATH}:${CMAKE_BINARY_DIR}/lib LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${PROJECT_BINARY_DIR}/lib ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR} -DCMAKE_INSTALL_LIBDIR=lib -Dbuild_tests=OFF -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} ${PROJECT_BINARY_DIR}/blaspp-prefix/src/blaspp
-	  BUILD_COMMAND ${CMAKE_COMMAND} -E env LIBRARY_PATH=$ENV{LIBRARY_PATH}:${PROJECT_BINARY_DIR}/lib LIB_SUFFIX="" ${CMAKE_COMMAND} --build .
-	  INSTALL_COMMAND ${CMAKE_COMMAND} -E env PREFIX=${PROJECT_BINARY_DIR} LIB_SUFFIX="" ${CMAKE_COMMAND} --install .
-	  )
-  ExternalProject_Add_StepDependencies(blaspp build ${BLAS_LIBRARIES})
+
+if (BLAS++ OR LAPACK++)
+
+  if (BLAS++)
+    _display_cpp_implementation_msg("BLAS")
+  endif()
+
+  # Check if population has already been performed
+  FetchContent_GetProperties(blaspp)
+  if(NOT blaspp_POPULATED)
+    # Fetch the content using previously declared details
+    FetchContent_Populate(blaspp)
+  endif()
+
+  set( BLASPP_BLAS_LIBRARIES "-D BLA_VENDOR=Generic" )
+  if (NOT BUILD_SHARED_LIBS)
+    set( BLASPP_BLAS_LIBRARIES "-D BLAS_LIBRARIES=\"${BLAS_LIBRARIES}\"" )
+  endif()
+
+  # Adds target blaspp
+  add_custom_target( blaspp ALL
+    COMMAND ${CMAKE_COMMAND}
+      -B "${blaspp_BINARY_DIR}"
+      -D CMAKE_PREFIX_PATH="${PROJECT_BINARY_DIR};${PROJECT_BINARY_DIR}/lib"
+      -D CMAKE_INSTALL_PREFIX="${PROJECT_BINARY_DIR}"
+      "${BLASPP_BLAS_LIBRARIES}"
+      -D build_tests=OFF
+      -D BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+    COMMAND ${CMAKE_COMMAND}
+      --build "${blaspp_BINARY_DIR}"
+      --target install
+    WORKING_DIRECTORY "${blaspp_SOURCE_DIR}"
+    COMMENT "Building BLAS++"
+  )
+
+  # Set up dependencies
+  if(NOT BLAS_FOUND)
+    add_dependencies(blaspp ${BLASLIB})
+  endif()
+  if(NOT LATESTLAPACK_FOUND)
+    add_dependencies(blaspp ${LAPACKLIB})
+  endif()
 endif()
+
 if (LAPACK++)
-	message (STATUS "linking lapack++ against ${LAPACK_LIBRARIES}")
   _display_cpp_implementation_msg("LAPACK")
-  include(ExternalProject)
-  if (BUILD_SHARED_LIBS)
-  ExternalProject_Add(lapackpp
-	  URL https://bitbucket.org/icl/lapackpp/downloads/lapackpp-2020.10.02.tar.gz
-	  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env LIBRARY_PATH=$ENV{LIBRARY_PATH}:${CMAKE_BINARY_DIR}/lib LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${PROJECT_BINARY_DIR}/lib ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR} -DCMAKE_INSTALL_LIBDIR=lib -DLAPACK_LIBRARIES=${LAPACK_LIBRARIES} -Dbuild_tests=OFF -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}  ${PROJECT_BINARY_DIR}/lapackpp-prefix/src/lapackpp
-	  BUILD_COMMAND ${CMAKE_COMMAND} -E env LIBRARY_PATH=$ENV{LIBRARY_PATH}:${PROJECT_BINARY_DIR}/lib LIB_SUFFIX="" ${CMAKE_COMMAND} --build .
-	  INSTALL_COMMAND ${CMAKE_COMMAND} -E env PREFIX=${PROJECT_BINARY_DIR} LIB_SUFFIX="" ${CMAKE_COMMAND} --install .
-	  )
-  else ()
-# FIXME this does not really work as the libraries list gets converted to a semicolon-separated list somewhere in the lapack++ build files
-  ExternalProject_Add(lapackpp
-	  URL https://bitbucket.org/icl/lapackpp/downloads/lapackpp-2020.10.02.tar.gz
-	  CONFIGURE_COMMAND env LIBRARY_PATH=$ENV{LIBRARY_PATH}:${CMAKE_BINARY_DIR}/lib LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${PROJECT_BINARY_DIR}/lib ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR} -DCMAKE_INSTALL_LIBDIR=lib -DLAPACK_LIBRARIES="${PROJECT_BINARY_DIR}/lib/liblapack.a -lgfortran" -Dbuild_tests=OFF -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}  ${PROJECT_BINARY_DIR}/lapackpp-prefix/src/lapackpp
-	  BUILD_COMMAND env LIBRARY_PATH=$ENV{LIBRARY_PATH}:${PROJECT_BINARY_DIR}/lib LIB_SUFFIX="" ${CMAKE_COMMAND} --build .
-	  INSTALL_COMMAND ${CMAKE_COMMAND} -E env PREFIX=${PROJECT_BINARY_DIR} LIB_SUFFIX="" ${CMAKE_COMMAND} --install .
-  )
+
+  # Check if population has already been performed
+  FetchContent_GetProperties(lapackpp)
+  if(NOT lapackpp_POPULATED)
+    # Fetch the content using previously declared details
+    FetchContent_Populate(lapackpp)
   endif()
-  ExternalProject_Add_StepDependencies(lapackpp build blaspp ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
+
+  # Adds target lapackpp
+  add_custom_target( lapackpp ALL
+    COMMAND ${CMAKE_COMMAND}
+      -B "${lapackpp_BINARY_DIR}"
+      -D CMAKE_PREFIX_PATH="${PROJECT_BINARY_DIR}"
+      -D CMAKE_INSTALL_PREFIX="${PROJECT_BINARY_DIR}"
+      -D BLA_VENDOR=Generic
+      -D build_tests=OFF
+      -D BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+    COMMAND ${CMAKE_COMMAND}
+      --build "${lapackpp_BINARY_DIR}"
+      --target install
+    WORKING_DIRECTORY "${lapackpp_SOURCE_DIR}"
+    COMMENT "Building LAPACK++"
+  )
+
+  # Set up dependencies
+  add_dependencies(lapackpp blaspp)
 endif()
 
 # --------------------------------------------------