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
3da61b25
Commit
3da61b25
authored
Oct 20, 2017
by
Davis King
Browse files
Added install_target_output_folder option to matlab cmake scripts.
parent
1d8445cb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
dlib/matlab/CMakeLists.txt
dlib/matlab/CMakeLists.txt
+5
-0
dlib/matlab/cmake_mex_wrapper
dlib/matlab/cmake_mex_wrapper
+5
-1
No files found.
dlib/matlab/CMakeLists.txt
View file @
3da61b25
...
@@ -7,6 +7,11 @@ include(cmake_mex_wrapper)
...
@@ -7,6 +7,11 @@ include(cmake_mex_wrapper)
add_subdirectory
(
.. dlib_build
)
add_subdirectory
(
.. dlib_build
)
# You can tell cmake where to put the mex files when you run 'make install' by
# setting this variable. The path is relative to this CMakeLists.txt file.
set
(
install_target_output_folder .
)
# Compile the example_mex_function.cpp file and link it to dlib. Note
# Compile the example_mex_function.cpp file and link it to dlib. Note
# that you can give a list of things to link to here. E.g.
# that you can give a list of things to link to here. E.g.
# add_mex_function(some_other_mex_function pthread dlib fftw)
# add_mex_function(some_other_mex_function pthread dlib fftw)
...
...
dlib/matlab/cmake_mex_wrapper
View file @
3da61b25
...
@@ -93,7 +93,11 @@ MACRO(add_mex_function name )
...
@@ -93,7 +93,11 @@ MACRO(add_mex_function name )
endif()
endif()
set_target_properties(${name} PROPERTIES PREFIX "")
set_target_properties(${name} PROPERTIES PREFIX "")
TARGET_LINK_LIBRARIES(${name} ${MATLAB_LIBRARIES} ${ARGN})
TARGET_LINK_LIBRARIES(${name} ${MATLAB_LIBRARIES} ${ARGN})
if (install_target_output_folder)
install(TARGETS ${name} DESTINATION "${install_target_output_folder}")
else()
install(TARGETS ${name} DESTINATION "${install_dir}")
install(TARGETS ${name} DESTINATION "${install_dir}")
endif()
ENDMACRO()
ENDMACRO()
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