diff options
Diffstat (limited to 'matlab/CMakeLists.txt')
| -rw-r--r-- | matlab/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/matlab/CMakeLists.txt b/matlab/CMakeLists.txt index 4b0d549f..f420df8d 100644 --- a/matlab/CMakeLists.txt +++ b/matlab/CMakeLists.txt @@ -43,7 +43,7 @@ string(REPLACE ";" ";-L" link_folders "-L${folders}") string(REPLACE ";" ":" rpath_folders "${folders}") if(build_using MATCHES "Matlab") - set(libflags -lcaffe${CAffe_POSTFIX} ${libflags}) # Matlab R2014a complans for -Wl,--whole-archive + set(libflags -lcaffe${Caffe_POSTFIX} ${libflags}) # Matlab R2014a complans for -Wl,--whole-archive caffe_fetch_and_set_proper_mexext(Matlab_caffe_mex) add_custom_command(OUTPUT ${Matlab_caffe_mex} COMMAND ${Matlab_mex} @@ -56,7 +56,7 @@ elseif(build_using MATCHES "Octave") if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(libflags -Wl,-force_load,$<TARGET_LINKER_FILE:caffe> ${libflags}) elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - set(libflags -Wl,--whole-archive -lcaffe${CAffe_POSTFIX} -Wl,--no-whole-archive ${libflags}) + set(libflags -Wl,--whole-archive -lcaffe${Caffe_POSTFIX} -Wl,--no-whole-archive ${libflags}) endif() add_custom_command(OUTPUT ${Matlab_caffe_mex} COMMAND ${Octave_compiler} |