Fix finding of MKL for Intel 2021 and newer (#162)

awvwgk · web-flow · commit 08c3bcfd9fcc · 2022-05-26T14:08:16.000+02:00
diff --git a/app/meson.build b/app/meson.build
@@ -23,6 +23,7 @@ dftd4_exe = executable(
   ),
   dependencies: dftd4_dep,
   install: install,
+  link_language: 'fortran',
 )
 
 test('app-version', dftd4_exe, args: '--version')
diff --git a/config/meson.build b/config/meson.build
@@ -16,6 +16,10 @@
 
 os = host_machine.system()
 fc = meson.get_compiler('fortran')
+cc = fc
+if has_cc
+  cc = meson.get_compiler('c')
+endif
 fc_id = fc.get_id()
 
 if fc_id == 'gcc'
@@ -53,22 +57,22 @@ endif
 if lapack_vendor == 'mkl'
   mkl_dep = []
   if fc_id == 'intel'
-    mkl_dep += fc.find_library('mkl_intel_lp64')
+    mkl_dep += cc.find_library('mkl_intel_lp64')
     if get_option('openmp')
-      mkl_dep += fc.find_library('mkl_intel_thread')
+      mkl_dep += cc.find_library('mkl_intel_thread')
     endif
   elif fc_id == 'gcc'
-    mkl_dep += fc.find_library('mkl_gf_lp64')
+    mkl_dep += cc.find_library('mkl_gf_lp64')
     if get_option('openmp')
-      mkl_dep += fc.find_library('mkl_gnu_thread')
+      mkl_dep += cc.find_library('mkl_gnu_thread')
     endif
   else
     error('MKL not supported for this compiler')
   endif
   if not get_option('openmp')
-    mkl_dep += fc.find_library('mkl_tbb_thread')
+    mkl_dep += cc.find_library('mkl_tbb_thread')
   endif
-  mkl_dep += fc.find_library('mkl_core')
+  mkl_dep += cc.find_library('mkl_core')
   lib_deps += mkl_dep
 
 elif lapack_vendor == 'mkl-rt'
diff --git a/test/unit/meson.build b/test/unit/meson.build
@@ -46,6 +46,7 @@ tester = executable(
   'tester',
   sources: test_srcs,
   dependencies: [dftd4_dep, mstore_dep],
+  link_language: 'fortran',
 )
 
 foreach t : tests

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ dftd4_exe = executable(`
`23`	`23`	`),`
`24`	`24`	`dependencies: dftd4_dep,`
`25`	`25`	`install: install,`
	`26`	`+ link_language: 'fortran',`
`26`	`27`	`)`
`27`	`28`
`28`	`29`	`test('app-version', dftd4_exe, args: '--version')`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ tester = executable(`
`46`	`46`	`'tester',`
`47`	`47`	`sources: test_srcs,`
`48`	`48`	`dependencies: [dftd4_dep, mstore_dep],`
	`49`	`+ link_language: 'fortran',`
`49`	`50`	`)`
`50`	`51`
`51`	`52`	`foreach t : tests`