<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/be49b02e31ab8bbcc8e6cf32f91a2a697fb3fee9">https://github.com/macports/macports-ports/commit/be49b02e31ab8bbcc8e6cf32f91a2a697fb3fee9</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new be49b02 gmsh-devel: update to latest upstream commit
</span>be49b02 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit be49b02e31ab8bbcc8e6cf32f91a2a697fb3fee9
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Feb 9 08:43:08 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> gmsh-devel: update to latest upstream commit
</span>---
science/gmsh/Portfile | 6 ++++--
science/gmsh/files/patch-no_macports_openmp.diff | 17 +++++++++++++++++
2 files changed, 21 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmsh/Portfile b/science/gmsh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5658db2..15da958 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,11 +112,13 @@ subport gmsh-devel {
</span>
fetch.type git
git.url https://gitlab.onelab.info/gmsh/gmsh.git
<span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch edc5fa3fbb0a25b520b28bd2b9406cd4dce38a82
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch 3247fa9120e32dc2fe8c76689ec46d479f475cce
</span> # see https://gitlab.onelab.info/gmsh/gmsh/blob/master/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 4.1.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 4.1.5
</span> revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-prepend patch-no_macports_openmp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regexm
livecheck.url https://gitlab.onelab.info/gmsh/gmsh
livecheck.version ${git.branch}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmsh/files/patch-no_macports_openmp.diff b/science/gmsh/files/patch-no_macports_openmp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..cae9457
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmsh/files/patch-no_macports_openmp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2019-02-09 08:13:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-02-09 08:14:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -291,14 +291,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_config_option(HAVE_OPENMP "OpenMP")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif(APPLE AND EXISTS "/opt/local/lib/libomp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # just for testing the official Apple compiler with macports' libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_config_option(HAVE_OPENMP "OpenMP[MacPorts]")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_C_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${CMAKE_C_FLAGS} -Xpreprocessor -fopenmp -I/opt/local/include/libomp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_CXX_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp -I/opt/local/include/libomp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND EXTERNAL_LIBRARIES "-L/opt/local/lib/libomp -lomp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>