Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
bcf98e05
Commit
bcf98e05
authored
Dec 15, 2016
by
Davis King
Browse files
Fixed incorrect mex file name being shown in the generated class code.
parent
b85cb68e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
dlib/matlab/CMakeLists.txt
dlib/matlab/CMakeLists.txt
+1
-1
dlib/matlab/cmake_mex_wrapper
dlib/matlab/cmake_mex_wrapper
+2
-1
dlib/matlab/mex_wrapper.cpp
dlib/matlab/mex_wrapper.cpp
+1
-1
No files found.
dlib/matlab/CMakeLists.txt
View file @
bcf98e05
cmake_minimum_required
(
VERSION 2.8.
4
)
cmake_minimum_required
(
VERSION 2.8.
11
)
PROJECT
(
mex_functions
)
PROJECT
(
mex_functions
)
...
...
dlib/matlab/cmake_mex_wrapper
View file @
bcf98e05
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
# that additional library dependencies can be added like this: add_mex_function(name lib1 dlib libetc).
# that additional library dependencies can be added like this: add_mex_function(name lib1 dlib libetc).
# That is, just add more libraries after the name and they will be build into the mex file.
# That is, just add more libraries after the name and they will be build into the mex file.
cmake_minimum_required(VERSION 2.8.
4
)
cmake_minimum_required(VERSION 2.8.
11
)
set(BUILDING_MATLAB_MEX_FILE true)
set(BUILDING_MATLAB_MEX_FILE true)
set(CMAKE_POSITION_INDEPENDENT_CODE True)
set(CMAKE_POSITION_INDEPENDENT_CODE True)
...
@@ -69,6 +69,7 @@ INCLUDE(InstallRequiredSystemLibraries)
...
@@ -69,6 +69,7 @@ INCLUDE(InstallRequiredSystemLibraries)
MACRO(add_mex_function name )
MACRO(add_mex_function name )
ADD_LIBRARY(${name} MODULE ${name}.cpp )
ADD_LIBRARY(${name} MODULE ${name}.cpp )
target_compile_definitions(${name} PRIVATE -DMEX_FILENAME=${name})
if (UNIX)
if (UNIX)
# Doing this prevents our mex function from exporting any symbols
# Doing this prevents our mex function from exporting any symbols
# other than mexFunction(). This sometimes doesn't matter but sometimes
# other than mexFunction(). This sometimes doesn't matter but sometimes
...
...
dlib/matlab/mex_wrapper.cpp
View file @
bcf98e05
...
@@ -4897,7 +4897,7 @@ void mexFunction( int nlhs, mxArray *plhs[],
...
@@ -4897,7 +4897,7 @@ void mexFunction( int nlhs, mxArray *plhs[],
string
classname
=
trim
(
string
(
DEF2STR
(
MEX_CLASS_NAME
)),
"
\t
()"
);
string
classname
=
trim
(
string
(
DEF2STR
(
MEX_CLASS_NAME
)),
"
\t
()"
);
std
::
vector
<
string
>
methods
=
split
(
trim
(
string
(
DEF2STR
(
MEX_CLASS_METHODS
)),
"
\t
()"
),
"
\t
,"
);
std
::
vector
<
string
>
methods
=
split
(
trim
(
string
(
DEF2STR
(
MEX_CLASS_METHODS
)),
"
\t
()"
),
"
\t
,"
);
string
mex_filename
=
"mex_"
+
classname
;
string
mex_filename
=
trim
(
string
(
DEF2STR
(
MEX_FILENAME
)),
"
\t
()"
)
;
bool
has_load_obj
=
false
;
bool
has_load_obj
=
false
;
size_t
load_obj_idx
=
0
;
size_t
load_obj_idx
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment