diff --git a/.github/workflows/version_check.yml b/.github/workflows/version_check.yml index 3be88b2720..4ad613ec17 100644 --- a/.github/workflows/version_check.yml +++ b/.github/workflows/version_check.yml @@ -33,7 +33,7 @@ jobs: fi # Verify that the version in version.h matches the tag - if [[ "${{ steps.versions.outputs.current_tag }}" != "v${CODE_VERSION}" ]]; then + if [[ "${{ steps.versions.outputs.current_tag }}" != "${CODE_VERSION}" ]]; then echo "::error::Version mismatch: tag=${{ steps.versions.outputs.current_tag }} ≠ code=${CODE_VERSION}" exit 1 fi diff --git a/cmake/FindMKL.cmake b/cmake/FindMKL.cmake index a0c389b5ae..f9cddfcf74 100644 --- a/cmake/FindMKL.cmake +++ b/cmake/FindMKL.cmake @@ -91,5 +91,12 @@ endif() if(NOT TARGET MKL::MKL_SCALAPACK) find_library(MKL_SCALAPACK NAMES mkl_scalapack_lp64 HINTS ${MKLROOT}/lib ${MKLROOT}/lib/intel64) message(STATUS "Found MKL_SCALAPACK: ${MKL_SCALAPACK}") - add_library(MKL::MKL_SCALAPACK OBJECT IMPORTED MKL_SCALAPACK) + if(MKL_SCALAPACK) + # create an IMPORTED target that points to the discovered library file + add_library(MKL::MKL_SCALAPACK UNKNOWN IMPORTED) + set_target_properties(MKL::MKL_SCALAPACK PROPERTIES + IMPORTED_LOCATION "${MKL_SCALAPACK}" + INTERFACE_INCLUDE_DIRECTORIES "${MKL_INCLUDE}" + ) + endif() endif()