Merge branch 'develop' into move_fem_files

vdweide · web-flow · commit 7dd940d2fcaf · 2020-05-24T16:43:36.000+02:00
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -43,6 +43,7 @@ Copyright holders might be the individual person or their respective employer. I
 ```
 Akshay.K.R
 Alejandro
+Aman uz zaman Baig
 Amit Sachdeva
 Ana Lourenco
 Andrew Burkett
@@ -59,6 +60,7 @@ Daumantas Kavolis
 Dave Taflin
 Eduardo Molina
 Ethan Alan Hereth
+FlorianDm
 Francisco D. Palacios
 Gaurav Bansal
 Giulio Gori
@@ -76,7 +78,9 @@ João Loureiro
 Kedar Naik
 LaSerpe
 Matteo Pini
+Max Le
 Max Sagebaum
+Michele Gaffuri
 Mickael Philit
 Ole Burghardt
 Patrick Mischke
@@ -90,6 +94,7 @@ Ryan Barrett
 Salvatore Vitale
 Samet Cakmakcioglu
 Scott Imlay
+Steffen Schotthöfer
 Steven Endres
 Teus van der Stelt
 Thomas D. Economon
@@ -98,18 +103,22 @@ TobiKattmann
 Trent Lukaczyk
 VivaanKhatri
 Wally Maier
+aaronyicongfu
 anilvar
 bmunguia
 chamsolli
 costat
+cr109
 cvencro
 daniel-linton
 demanosalvas
 dmudiger
 erangit
+flo
 hlkline
 juliendm
 jvanoostrom
+koodlyakshay
 mcolonno
 minkwankim
 padronas
diff --git a/SU2_PY/pySU2/meson.build b/SU2_PY/pySU2/meson.build
@@ -19,7 +19,7 @@ swig_gen = generator(
 )
 
 wrapper_deps = [
-    dependency('python3'),
+    python.dependency(embed: true),
 ]
 
 if get_option('enable-normal')
diff --git a/configure.ac b/configure.ac
@@ -66,7 +66,7 @@ AS_IF([test -z "$PYTHON_INCLUDE"], [
   ])
   AC_MSG_CHECKING([python include flags])
   PYTHON_INCLUDE=`$PYTHON_CONFIG --includes`
-  PYTHON_LIB=`$PYTHON_CONFIG --libs`
+  PYTHON_LIB=`$PYTHON_CONFIG --libs --embed`
   PYTHON_EXEC_PREFIX=`$PYTHON_CONFIG --exec-prefix`
   AC_MSG_RESULT([$PYTHON_INCLUDE])
 ])
diff --git a/externals/meson b/externals/meson
@@ -1 +1 @@
-Subproject commit 0435691e83fb7172e2a9635d2eb32d5521089916
+Subproject commit 29ef4478df6d3aaca40c7993f125b29409be1de2
diff --git a/externals/ninja b/externals/ninja
@@ -1 +1 @@
-Subproject commit 2d15b04e411229cb902332957281622119025e77
+Subproject commit 52649de2c56b63f42bc59513d51286531c595b44
diff --git a/meson_scripts/init.py b/meson_scripts/init.py
@@ -48,9 +48,9 @@ def init_submodules(method = 'auto'):
   github_repo_codi = 'https://github.com/scicompkl/CoDiPack'
   sha_version_medi = 'edde14f9ac4026b72b1e130f61c0a78e8652afa5'
   github_repo_medi = 'https://github.com/SciCompKL/MeDiPack'
-  sha_version_meson = '0435691e83fb7172e2a9635d2eb32d5521089916'
+  sha_version_meson = '29ef4478df6d3aaca40c7993f125b29409be1de2'
   github_repo_meson = 'https://github.com/mesonbuild/meson'
-  sha_version_ninja = '2d15b04e411229cb902332957281622119025e77'
+  sha_version_ninja = '52649de2c56b63f42bc59513d51286531c595b44'
   github_repo_ninja = 'https://github.com/ninja-build/ninja'
 
   medi_name = 'MeDiPack'

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ swig_gen = generator(`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`wrapper_deps = [`
`22`		`- dependency('python3'),`
	`22`	`+ python.dependency(embed: true),`
`23`	`23`	`]`
`24`	`24`
`25`	`25`	`if get_option('enable-normal')`