]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - jacinto-ai/caffe-jacinto.git/commitdiff
bugfix for incorrect behaviour in caffe_parse_linker_libs function while extracting...
authorAbhijit Kundu <abhijit.kundu@gatech.edu>
Tue, 9 Feb 2016 07:45:46 +0000 (02:45 -0500)
committerAbhijit Kundu <abhijit.kundu@gatech.edu>
Tue, 9 Feb 2016 07:45:46 +0000 (02:45 -0500)
cmake/Utils.cmake

index a1bde1ae95b342687bae89e2551a4e771dcc5d7c..653de5fdf89be08a753fe42a6fb82cc6b625c4d4 100644 (file)
@@ -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()