From 749306eb6438b4a09089f785471d1d9cb00b6666 Mon Sep 17 00:00:00 2001 From: Anatoly Baksheev Date: Fri, 15 May 2015 17:39:11 +0300 Subject: [PATCH] minor fix in cmake.config generation - do not force client libs to include numpy include dirs --- cmake/ConfigGen.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmake/ConfigGen.cmake b/cmake/ConfigGen.cmake index c82047d..a9101e3 100644 --- a/cmake/ConfigGen.cmake +++ b/cmake/ConfigGen.cmake @@ -11,6 +11,17 @@ function(caffe_get_current_includes includes_variable) list(FIND current_includes ${PROJECT_BINARY_DIR} __index) list(REMOVE_AT current_includes ${__index}) + # removing numpy includes (since not required for client libs) + set(__toremove "") + foreach(__i ${current_includes}) + if(${__i} MATCHES "python") + list(APPEND __toremove ${__i}) + endif() + endforeach() + if(__toremove) + list(REMOVE_ITEM current_includes ${__toremove}) + endif() + caffe_list_unique(current_includes) set(${includes_variable} ${current_includes} PARENT_SCOPE) endfunction() -- 2.7.4