Commit f547adc7 authored by Robert Kimball's avatar Robert Kimball Committed by Scott Cyphers

put ngraph and ngraph imported headers in search path before system files (#1408)

parent 1a8b1f97
...@@ -37,7 +37,6 @@ set(HEADER_SEARCH_DEFINES ...@@ -37,7 +37,6 @@ set(HEADER_SEARCH_DEFINES
"MKLDNN_HEADERS_PATH=\"${MKLDNN_INCLUDE_DIR}\"" "MKLDNN_HEADERS_PATH=\"${MKLDNN_INCLUDE_DIR}\""
"CLANG_BUILTIN_HEADERS_PATH=\"${LLVM_LIB_DIR}\"" "CLANG_BUILTIN_HEADERS_PATH=\"${LLVM_LIB_DIR}\""
"NGRAPH_HEADERS_PATH=\"${NGRAPH_INCLUDE_PATH}\"" "NGRAPH_HEADERS_PATH=\"${NGRAPH_INCLUDE_PATH}\""
"INSTALLED_HEADERS_PATH=\"${CMAKE_INSTALL_PREFIX}/include\""
) )
if(NGRAPH_DISTRIBUTED_ENABLE) if(NGRAPH_DISTRIBUTED_ENABLE)
......
...@@ -412,7 +412,6 @@ void codegen::CompilerCore::configure_search_path() ...@@ -412,7 +412,6 @@ void codegen::CompilerCore::configure_search_path()
add_header_search_path(MKLDNN_HEADERS_PATH); add_header_search_path(MKLDNN_HEADERS_PATH);
add_header_search_path(TBB_HEADERS_PATH); add_header_search_path(TBB_HEADERS_PATH);
add_header_search_path(NGRAPH_HEADERS_PATH); add_header_search_path(NGRAPH_HEADERS_PATH);
add_header_search_path(INSTALLED_HEADERS_PATH);
add_header_search_path(CLANG_BUILTIN_HEADERS_PATH); add_header_search_path(CLANG_BUILTIN_HEADERS_PATH);
add_header_search_path("/Library/Developer/CommandLineTools/usr/include/c++/v1"); add_header_search_path("/Library/Developer/CommandLineTools/usr/include/c++/v1");
...@@ -423,6 +422,10 @@ void codegen::CompilerCore::configure_search_path() ...@@ -423,6 +422,10 @@ void codegen::CompilerCore::configure_search_path()
// Instead of re-implementing all of that functionality in a custom toolchain // Instead of re-implementing all of that functionality in a custom toolchain
// just hardcode the paths relevant to frequently used build/test machines for now // just hardcode the paths relevant to frequently used build/test machines for now
add_header_search_path(CLANG_BUILTIN_HEADERS_PATH); add_header_search_path(CLANG_BUILTIN_HEADERS_PATH);
add_header_search_path(EIGEN_HEADERS_PATH);
add_header_search_path(MKLDNN_HEADERS_PATH);
add_header_search_path(TBB_HEADERS_PATH);
add_header_search_path(NGRAPH_HEADERS_PATH);
string header_version = find_header_version("/usr/include/c++"); string header_version = find_header_version("/usr/include/c++");
string os_specific_path = string os_specific_path =
...@@ -444,12 +447,6 @@ void codegen::CompilerCore::configure_search_path() ...@@ -444,12 +447,6 @@ void codegen::CompilerCore::configure_search_path()
file_util::path_join("/usr/lib/gcc/x86_64-linux-gnu/", header_version, "/include-fixed")); file_util::path_join("/usr/lib/gcc/x86_64-linux-gnu/", header_version, "/include-fixed"));
add_header_search_path("/usr/include/x86_64-linux-gnu"); add_header_search_path("/usr/include/x86_64-linux-gnu");
add_header_search_path("/usr/include"); add_header_search_path("/usr/include");
add_header_search_path(EIGEN_HEADERS_PATH);
add_header_search_path(MKLDNN_HEADERS_PATH);
add_header_search_path(TBB_HEADERS_PATH);
add_header_search_path(NGRAPH_HEADERS_PATH);
add_header_search_path(INSTALLED_HEADERS_PATH);
#endif #endif
#ifdef CUDA_HEADER_PATHS #ifdef CUDA_HEADER_PATHS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment