Update dependency handling in meson (#136)

awvwgk · web-flow · commit 982bb90fc0b0 · 2021-11-14T15:50:20.000+01:00
diff --git a/config/meson.build b/config/meson.build
@@ -108,43 +108,17 @@ else
 endif
 
 # Create the tool chain library as subproject
-mctc_dep = dependency('mctc-lib', required: false)
-if not mctc_dep.found()
-  mctc_prj = subproject(
-    'mctc-lib',
-    version: '>=0.2',
-    default_options: [
-      'default_library=static',
-    ],
-  )
-  mctc_dep = mctc_prj.get_variable('mctc_dep')
-
-  if install
-    install_data(
-      mctc_prj.get_variable('mctc_lic'),
-      install_dir: get_option('datadir')/'licenses'/meson.project_name()/'mctc-lib'
-    )
-  endif
-endif
+mctc_dep = dependency(
+  'mctc-lib',
+  fallback: ['mctc-lib', 'mctc_dep'],
+  default_options: ['default_library=static'],
+)
 lib_deps += mctc_dep
 
-# Create the tool chain library as subproject
-multicharge_dep = dependency('multicharge', required: false)
-if not multicharge_dep.found()
-  multicharge_prj = subproject(
-    'multicharge',
-    version: '>=0.1',
-    default_options: [
-      'default_library=static',
-    ],
-  )
-  multicharge_dep = multicharge_prj.get_variable('multicharge_dep')
-
-  if install
-    install_data(
-      multicharge_prj.get_variable('multicharge_lic'),
-      install_dir: get_option('datadir')/'licenses'/meson.project_name()/'multicharge'
-    )
-  endif
-endif
+# Create the electrostatic library as subproject
+multicharge_dep = dependency(
+  'multicharge',
+  fallback: ['multicharge', 'multicharge_dep'],
+  default_options: ['default_library=static'],
+)
 lib_deps += multicharge_dep
diff --git a/test/unit/meson.build b/test/unit/meson.build
@@ -15,19 +15,16 @@
 # along with dftd4.  If not, see <https://www.gnu.org/licenses/>.
 
 # Create mstore as subproject for testing
-mstore_prj = subproject(
+mstore_dep = dependency(
   'mstore',
-  version: '>=0.1',
+  fallback: ['mstore', 'mstore_dep'],
+  default_options: ['default_library=static'],
   required: not meson.is_subproject(),
-  default_options: [
-    'default_library=static',
-  ],
 )
 # If we do not find mstore and are a subproject, we just skip testing
-if not mstore_prj.found()
+if not mstore_dep.found()
   subdir_done()
 endif
-mstore_dep = mstore_prj.get_variable('mstore_dep')
 
 tests = [
   'ncoord',
