Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dynare
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dynare
dynare
Commits
e3ff2f10
Verified
Commit
e3ff2f10
authored
4 days ago
by
Sébastien Villemot
Browse files
Options
Downloads
Patches
Plain Diff
Build system: with Octave 10, MEX files must now be linked with liboctmex
parent
85bea5a6
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
meson.build
+5
-1
5 additions, 1 deletion
meson.build
windows/deps/mkoctfile64
+2
-0
2 additions, 0 deletions
windows/deps/mkoctfile64
with
7 additions
and
1 deletion
meson.build
+
5
−
1
View file @
e3ff2f10
...
...
@@ -199,7 +199,11 @@ else # Octave build
octave_incflags
=
run_command
(
mkoctfile_exe
,
'-p'
,
'INCFLAGS'
,
check
:
true
).
stdout
().
split
()
octlibdir
=
run_command
(
mkoctfile_exe
,
'-p'
,
'OCTLIBDIR'
,
check
:
true
).
stdout
().
strip
()
octave_libs
=
run_command
(
mkoctfile_exe
,
'-p'
,
'OCTAVE_LIBS'
,
check
:
true
).
stdout
().
split
()
if
octave_version
.
version_compare
(
'<10'
)
octave_libs
=
run_command
(
mkoctfile_exe
,
'-p'
,
'OCTAVE_LIBS'
,
check
:
true
).
stdout
().
split
()
else
octave_libs
=
run_command
(
mkoctfile_exe
,
'-p'
,
'LIBOCTMEX'
,
check
:
true
).
stdout
().
split
()
endif
octave_link_args
=
[]
...
...
This diff is collapsed.
Click to expand it.
windows/deps/mkoctfile64
+
2
−
0
View file @
e3ff2f10
...
...
@@ -105,6 +105,8 @@ fi
:
${
OCTAVE_LIBS
=
"
$LIBOCTINTERP
$LIBOCTAVE
$SPECIAL_MATH_LIB
"
}
:
${
LIBOCTMEX
=
"-loctmex"
}
# Local variables.
FFTW_LIBS
=
"
$FFTW3_LDFLAGS
$FFTW3_LIBS
$FFTW3F_LDFLAGS
$FFTW3F_LIBS
"
...
...
This diff is collapsed.
Click to expand it.
Sébastien Villemot
@sebastien
mentioned in commit
4e85c763
·
3 days ago
mentioned in commit
4e85c763
mentioned in commit 4e85c7639641b50d76844827a38421a79698ee3b
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment