Merge pull request #3650 from intbots/cmake-matlab-fix

bugfix for incorrect behaviour in `caffe_parse_linker_libs`
msracver · Feb 9, 2016 · 33f2445 · 33f2445
2 parents b590f1d + 68c751c
commit 33f2445
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
@@ -346,10 +346,11 @@ function(caffe_parse_linker_libs Caffe_LINKER_LIBS_variable folders_var flags_va
     elseif(lib MATCHES "^-l.*")
       list(APPEND libflags ${lib})
     elseif(IS_ABSOLUTE ${lib})
-      get_filename_component(name_we ${lib} NAME_WE)
       get_filename_component(folder  ${lib} PATH)
+      get_filename_component(filename ${lib} NAME)
+      string(REGEX REPLACE "\\.[^.]*$" "" filename_without_shortest_ext ${filename})
 
-      string(REGEX MATCH "^lib(.*)" __match ${name_we})
+      string(REGEX MATCH "^lib(.*)" __match ${filename_without_shortest_ext})
       list(APPEND libflags -l${CMAKE_MATCH_1})
       list(APPEND folders    ${folder})
     else()