diff options
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch')
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch | 251 |
1 files changed, 125 insertions, 126 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch index 38de10f4..39d40983 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch | |||
@@ -1,31 +1,33 @@ | |||
1 | From 3d7373487eacf4e3283183bbc9a771cb4b97c7ab Mon Sep 17 00:00:00 2001 | 1 | From 8a5804c723c5bd396e5029f254f866f19a679cc5 Mon Sep 17 00:00:00 2001 |
2 | From: Erin Park <erin.park@intel.com> | 2 | From: Erin Park <erin.park@intel.com> |
3 | Date: Wed, 11 Sep 2019 09:04:23 -0700 | 3 | Date: Wed, 11 Sep 2019 09:04:23 -0700 |
4 | Subject: [PATCH] R2 Build fixes | 4 | Subject: [PATCH 1/7] R2 Build fixes |
5 | 5 | ||
6 | -Update to R3 | ||
6 | -linux os-release name search | 7 | -linux os-release name search |
7 | -Use system libraries for (OMP/TBB) | 8 | -Use system libraries for (OMP/TBB) |
8 | -Use system libraries for ngraph, ade, puigxml, gflags | 9 | -Use system libraries for ngraph, ade, puigxml, gflags |
9 | -Turn on ENABLE_PYTHON | 10 | -Turn on ENABLE_PYTHON |
10 | 11 | ||
11 | Upstream-Status: Pending [Taken from Clear Linux] | 12 | Upstream-Status: Pending [Taken from Clear Linux and updated to R3] |
12 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
14 | Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com> | ||
13 | --- | 15 | --- |
14 | inference-engine/CMakeLists.txt | 4 +++ | 16 | inference-engine/CMakeLists.txt | 4 +++ |
15 | inference-engine/cmake/dependencies.cmake | 32 +++++++++++-------- | 17 | inference-engine/cmake/dependencies.cmake | 30 ++++++++++++---------- |
16 | .../cmake/developer_package.cmake | 12 +++---- | 18 | inference-engine/cmake/developer_package.cmake | 12 ++++----- |
17 | inference-engine/cmake/ie_parallel.cmake | 10 +++--- | 19 | inference-engine/cmake/ie_parallel.cmake | 6 ++--- |
18 | inference-engine/cmake/linux_name.cmake | 2 +- | 20 | inference-engine/cmake/linux_name.cmake | 2 +- |
19 | inference-engine/samples/CMakeLists.txt | 2 -- | 21 | inference-engine/samples/CMakeLists.txt | 2 -- |
20 | .../src/inference_engine/CMakeLists.txt | 5 +-- | 22 | .../src/inference_engine/CMakeLists.txt | 5 ++-- |
21 | inference-engine/thirdparty/CMakeLists.txt | 7 ---- | 23 | inference-engine/thirdparty/CMakeLists.txt | 9 ------- |
22 | 8 files changed, 38 insertions(+), 36 deletions(-) | 24 | 8 files changed, 34 insertions(+), 36 deletions(-) |
23 | 25 | ||
24 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt | 26 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt |
25 | index 0d449c9..5ee8f53 100644 | 27 | index f41d9df..a282cb4 100644 |
26 | --- a/inference-engine/CMakeLists.txt | 28 | --- a/inference-engine/CMakeLists.txt |
27 | +++ b/inference-engine/CMakeLists.txt | 29 | +++ b/inference-engine/CMakeLists.txt |
28 | @@ -59,6 +59,10 @@ add_cpplint_target(sample_cpplint | 30 | @@ -62,6 +62,10 @@ add_cpplint_target(sample_cpplint |
29 | EXCLUDE_PATTERNS "thirdparty/*" "pugixml/*") | 31 | EXCLUDE_PATTERNS "thirdparty/*" "pugixml/*") |
30 | 32 | ||
31 | if (ENABLE_PYTHON) | 33 | if (ENABLE_PYTHON) |
@@ -37,120 +39,114 @@ index 0d449c9..5ee8f53 100644 | |||
37 | endif() | 39 | endif() |
38 | 40 | ||
39 | diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake | 41 | diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake |
40 | index 00a5b8e..d493426 100644 | 42 | index 682f2e5..36c3f4d 100644 |
41 | --- a/inference-engine/cmake/dependencies.cmake | 43 | --- a/inference-engine/cmake/dependencies.cmake |
42 | +++ b/inference-engine/cmake/dependencies.cmake | 44 | +++ b/inference-engine/cmake/dependencies.cmake |
43 | @@ -71,11 +71,11 @@ if (WIN32) | 45 | @@ -51,11 +51,11 @@ if (THREADING STREQUAL "OMP") |
44 | ENVIRONMENT "OMP" | 46 | ENVIRONMENT "OMP" |
45 | VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") | 47 | VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") |
46 | elseif(LINUX) | 48 | elseif(LINUX) |
47 | - RESOLVE_DEPENDENCY(OMP | 49 | - RESOLVE_DEPENDENCY(OMP |
48 | - ARCHIVE_LIN "iomp.tgz" | 50 | - ARCHIVE_LIN "iomp.tgz" |
49 | - TARGET_PATH "${TEMP}/omp" | 51 | - TARGET_PATH "${TEMP}/omp" |
50 | - ENVIRONMENT "OMP" | 52 | - ENVIRONMENT "OMP" |
51 | - VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") | 53 | - VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") |
52 | +# RESOLVE_DEPENDENCY(OMP | 54 | + #RESOLVE_DEPENDENCY(OMP |
53 | +# ARCHIVE_LIN "iomp.tgz" | 55 | + # ARCHIVE_LIN "iomp.tgz" |
54 | +# TARGET_PATH "${TEMP}/omp" | 56 | + # TARGET_PATH "${TEMP}/omp" |
55 | +# ENVIRONMENT "OMP" | 57 | + # ENVIRONMENT "OMP" |
56 | +# VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") | 58 | + # VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") |
57 | else(APPLE) | 59 | else(APPLE) |
58 | RESOLVE_DEPENDENCY(OMP | 60 | RESOLVE_DEPENDENCY(OMP |
59 | ARCHIVE_MAC "iomp_20190130_mac.tgz" | 61 | ARCHIVE_MAC "iomp_20190130_mac.tgz" |
60 | @@ -83,8 +83,11 @@ else(APPLE) | 62 | @@ -63,8 +63,10 @@ if (THREADING STREQUAL "OMP") |
61 | ENVIRONMENT "OMP" | 63 | ENVIRONMENT "OMP" |
62 | VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") | 64 | VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") |
63 | endif() | 65 | endif() |
64 | -log_rpath_from_dir(OMP "${OMP}/lib") | 66 | - log_rpath_from_dir(OMP "${OMP}/lib") |
65 | -debug_message(STATUS "intel_omp=" ${OMP}) | 67 | - debug_message(STATUS "intel_omp=" ${OMP}) |
66 | + | 68 | + if (NOT LINUX) |
67 | +if (OMP) | 69 | + log_rpath_from_dir(OMP "${OMP}/lib") |
68 | + log_rpath_from_dir(OMP "${OMP}/lib") | 70 | + debug_message(STATUS "intel_omp=" ${OMP}) |
69 | + debug_message(STATUS "intel_omp=" ${OMP}) | 71 | + endif () |
70 | +endif () | ||
71 | endif () | 72 | endif () |
72 | 73 | ||
73 | ## TBB package | 74 | ## TBB package |
74 | @@ -97,10 +100,10 @@ if (WIN32) | 75 | @@ -77,10 +79,10 @@ if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") |
75 | ENVIRONMENT "TBBROOT" | 76 | ENVIRONMENT "TBBROOT" |
76 | VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") | 77 | VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") |
77 | elseif(LINUX) | 78 | elseif(LINUX) |
78 | - RESOLVE_DEPENDENCY(TBB | 79 | - RESOLVE_DEPENDENCY(TBB |
79 | - ARCHIVE_LIN "tbb2019_20181010_lin.tgz" | 80 | - ARCHIVE_LIN "tbb2019_20181010_lin.tgz" |
80 | - TARGET_PATH "${TEMP}/tbb" | 81 | - TARGET_PATH "${TEMP}/tbb" |
81 | - ENVIRONMENT "TBBROOT") | 82 | - ENVIRONMENT "TBBROOT") |
82 | +# RESOLVE_DEPENDENCY(TBB | 83 | + #RESOLVE_DEPENDENCY(TBB |
83 | +# ARCHIVE_LIN "tbb2019_20181010_lin.tgz" | 84 | + # ARCHIVE_LIN "tbb2019_20181010_lin.tgz" |
84 | +# TARGET_PATH "${TEMP}/tbb" | 85 | + # TARGET_PATH "${TEMP}/tbb" |
85 | +# ENVIRONMENT "TBBROOT") | 86 | + # ENVIRONMENT "TBBROOT") |
86 | else(APPLE) | 87 | else(APPLE) |
87 | RESOLVE_DEPENDENCY(TBB | 88 | RESOLVE_DEPENDENCY(TBB |
88 | ARCHIVE_MAC "tbb2019_20190414_mac.tgz" | 89 | ARCHIVE_MAC "tbb2019_20190414_v1_mac.tgz" |
89 | @@ -108,8 +111,11 @@ else(APPLE) | 90 | @@ -88,8 +90,10 @@ if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") |
90 | ENVIRONMENT "TBBROOT" | 91 | ENVIRONMENT "TBBROOT" |
91 | VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") | 92 | VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") |
92 | endif() | 93 | endif() |
93 | -log_rpath_from_dir(TBB "${TBB}/lib") | 94 | - log_rpath_from_dir(TBB "${TBB}/lib") |
94 | -debug_message(STATUS "tbb=" ${TBB}) | 95 | - debug_message(STATUS "tbb=" ${TBB}) |
95 | + | 96 | + if (NOT LINUX) |
96 | +if (TBB) | 97 | + log_rpath_from_dir(TBB "${TBB}/lib") |
97 | + log_rpath_from_dir(TBB "${TBB}/lib") | 98 | + debug_message(STATUS "tbb=" ${TBB}) |
98 | + debug_message(STATUS "tbb=" ${TBB}) | 99 | + endif () |
99 | +endif () | ||
100 | endif () | 100 | endif () |
101 | 101 | ||
102 | if (ENABLE_OPENCV) | 102 | if (ENABLE_OPENCV) |
103 | diff --git a/inference-engine/cmake/developer_package.cmake b/inference-engine/cmake/developer_package.cmake | 103 | diff --git a/inference-engine/cmake/developer_package.cmake b/inference-engine/cmake/developer_package.cmake |
104 | index 52e0fef..06ba167 100644 | 104 | index a27143d..950ccf4 100644 |
105 | --- a/inference-engine/cmake/developer_package.cmake | 105 | --- a/inference-engine/cmake/developer_package.cmake |
106 | +++ b/inference-engine/cmake/developer_package.cmake | 106 | +++ b/inference-engine/cmake/developer_package.cmake |
107 | @@ -95,12 +95,12 @@ if(NOT UNIX) | 107 | @@ -93,12 +93,12 @@ if(NOT UNIX) |
108 | set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}) | 108 | set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}) |
109 | set(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}) # compatibility issue: linux uses LIBRARY_OUTPUT_PATH, windows uses LIBRARY_OUTPUT_DIRECTORY | 109 | set(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}) # compatibility issue: linux uses LIBRARY_OUTPUT_PATH, windows uses LIBRARY_OUTPUT_DIRECTORY |
110 | else() | 110 | else() |
111 | - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) | 111 | - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) |
112 | - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) | 112 | - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) |
113 | - set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) | 113 | - set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}) |
114 | - set(CMAKE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) | 114 | - set(CMAKE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}) |
115 | - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) | 115 | - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}) |
116 | - set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) | 116 | - set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) |
117 | + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) | 117 | + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) |
118 | + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) | 118 | + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) |
119 | + set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) | 119 | + set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}) |
120 | + set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) | 120 | + set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}) |
121 | + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) | 121 | + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}) |
122 | + set(LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) | 122 | + set(LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) |
123 | set(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}/lib) | 123 | set(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}/lib) |
124 | endif() | 124 | endif() |
125 | 125 | ||
126 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake | 126 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake |
127 | index 8265701..9d4a884 100644 | 127 | index 97e8c5e..9b03652 100644 |
128 | --- a/inference-engine/cmake/ie_parallel.cmake | 128 | --- a/inference-engine/cmake/ie_parallel.cmake |
129 | +++ b/inference-engine/cmake/ie_parallel.cmake | 129 | +++ b/inference-engine/cmake/ie_parallel.cmake |
130 | @@ -22,9 +22,9 @@ function(set_ie_threading_interface_for TARGET_NAME) | 130 | @@ -36,8 +36,8 @@ function(set_ie_threading_interface_for TARGET_NAME) |
131 | endif () | 131 | endif () |
132 | 132 | ||
133 | if (NOT TBB_INCLUDE_DIRS OR NOT TBB_LIBRARIES_RELEASE) | 133 | if (NOT TBB_INCLUDE_DIRS OR NOT TBB_LIBRARIES_RELEASE) |
134 | - find_path(TBB_INCLUDE_DIRS tbb/tbb.h ${incl_path} NO_DEFAULT_PATH) | 134 | - find_path(TBB_INCLUDE_DIRS tbb/tbb.h ${incl_path} NO_DEFAULT_PATH) |
135 | - find_library(TBB_LIBRARIES_RELEASE tbb ${lib_rel_path} NO_DEFAULT_PATH) | 135 | - find_library(TBB_LIBRARIES_RELEASE tbb ${lib_rel_path} NO_DEFAULT_PATH) |
136 | - find_library(TBB_LIBRARIES_DEBUG tbb_debug ${lib_dbg_path} NO_DEFAULT_PATH) | 136 | + find_path(TBB_INCLUDE_DIRS tbb/tbb.h) |
137 | + find_path(TBB_INCLUDE_DIRS tbb/tbb.h) | 137 | + find_library(TBB_LIBRARIES_RELEASE tbb) |
138 | + find_library(TBB_LIBRARIES_RELEASE tbb) | 138 | ext_message(STATUS "TBB include: ${TBB_INCLUDE_DIRS}") |
139 | + find_library(TBB_LIBRARIES_DEBUG tbb) | 139 | ext_message(STATUS "TBB Release lib: ${TBB_LIBRARIES_RELEASE}") |
140 | ext_message(STATUS "TBB include: ${TBB_INCLUDE_DIRS}") | 140 | if (NOT LINUX) |
141 | ext_message(STATUS "TBB Release lib: ${TBB_LIBRARIES_RELEASE}") | 141 | @@ -98,7 +98,7 @@ function(set_ie_threading_interface_for TARGET_NAME) |
142 | ext_message(STATUS "TBB Debug lib: ${TBB_LIBRARIES_DEBUG}") | ||
143 | @@ -78,8 +78,8 @@ function(set_ie_threading_interface_for TARGET_NAME) | ||
144 | endif () | 142 | endif () |
145 | 143 | ||
146 | if (NOT OMP_LIBRARIES_RELEASE) | 144 | if (NOT OMP_LIBRARIES_RELEASE) |
147 | - find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name} ${lib_rel_path} NO_DEFAULT_PATH) | 145 | - find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name} ${lib_rel_path} NO_DEFAULT_PATH) |
148 | - find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name} ${lib_dbg_path} NO_DEFAULT_PATH) | ||
149 | + find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name}) | 146 | + find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name}) |
150 | + find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name}) | ||
151 | ext_message(STATUS "OMP Release lib: ${OMP_LIBRARIES_RELEASE}") | 147 | ext_message(STATUS "OMP Release lib: ${OMP_LIBRARIES_RELEASE}") |
152 | ext_message(STATUS "OMP Debug lib: ${OMP_LIBRARIES_DEBUG}") | 148 | if (NOT LINUX) |
153 | endif () | 149 | find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name} ${lib_dbg_path} NO_DEFAULT_PATH) |
154 | diff --git a/inference-engine/cmake/linux_name.cmake b/inference-engine/cmake/linux_name.cmake | 150 | diff --git a/inference-engine/cmake/linux_name.cmake b/inference-engine/cmake/linux_name.cmake |
155 | index 6713808..7e5e47a 100644 | 151 | index 6713808..7e5e47a 100644 |
156 | --- a/inference-engine/cmake/linux_name.cmake | 152 | --- a/inference-engine/cmake/linux_name.cmake |
@@ -165,7 +161,7 @@ index 6713808..7e5e47a 100644 | |||
165 | set(name_regex "NAME=\"([^ \"\n]*).*\"\n") | 161 | set(name_regex "NAME=\"([^ \"\n]*).*\"\n") |
166 | set(version_regex "VERSION=\"([0-9]+(\\.[0-9]+)?)[^\n]*\"") | 162 | set(version_regex "VERSION=\"([0-9]+(\\.[0-9]+)?)[^\n]*\"") |
167 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt | 163 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt |
168 | index d354f64..3802624 100644 | 164 | index d3a094c..884b0a6 100644 |
169 | --- a/inference-engine/samples/CMakeLists.txt | 165 | --- a/inference-engine/samples/CMakeLists.txt |
170 | +++ b/inference-engine/samples/CMakeLists.txt | 166 | +++ b/inference-engine/samples/CMakeLists.txt |
171 | @@ -91,8 +91,6 @@ set (GFLAGS_IS_SUBPROJECT TRUE) | 167 | @@ -91,8 +91,6 @@ set (GFLAGS_IS_SUBPROJECT TRUE) |
@@ -178,10 +174,10 @@ index d354f64..3802624 100644 | |||
178 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") | 174 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") |
179 | endif() | 175 | endif() |
180 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | 176 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt |
181 | index f3514ed..37a0744 100644 | 177 | index f4b34ad..2604c32 100644 |
182 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | 178 | --- a/inference-engine/src/inference_engine/CMakeLists.txt |
183 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | 179 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt |
184 | @@ -97,12 +97,13 @@ target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR} | 180 | @@ -116,6 +116,7 @@ target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR} |
185 | target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src") | 181 | target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src") |
186 | target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src") | 182 | target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src") |
187 | target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ocv") | 183 | target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ocv") |
@@ -189,6 +185,8 @@ index f3514ed..37a0744 100644 | |||
189 | 185 | ||
190 | if(ENABLE_MKL_DNN) | 186 | if(ENABLE_MKL_DNN) |
191 | target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/cpu/xbyak") | 187 | target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/cpu/xbyak") |
188 | @@ -125,7 +126,7 @@ if(ENABLE_UNICODE_PATH_SUPPORT) | ||
189 | target_compile_definitions(${TARGET_NAME} PUBLIC ENABLE_UNICODE_PATH_SUPPORT) | ||
192 | endif() | 190 | endif() |
193 | 191 | ||
194 | -set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) | 192 | -set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) |
@@ -196,8 +194,8 @@ index f3514ed..37a0744 100644 | |||
196 | 194 | ||
197 | # Static library used for unit tests which are always built | 195 | # Static library used for unit tests which are always built |
198 | 196 | ||
199 | @@ -132,7 +133,7 @@ if(WIN32) | 197 | @@ -159,7 +160,7 @@ if(ENABLE_UNICODE_PATH_SUPPORT) |
200 | target_compile_definitions(${TARGET_NAME}_s PRIVATE -DNOMINMAX) | 198 | target_compile_definitions(${TARGET_NAME}_s PUBLIC ENABLE_UNICODE_PATH_SUPPORT) |
201 | endif() | 199 | endif() |
202 | 200 | ||
203 | -set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s) | 201 | -set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s) |
@@ -206,31 +204,32 @@ index f3514ed..37a0744 100644 | |||
206 | target_link_libraries(${TARGET_NAME}_s PRIVATE fluid | 204 | target_link_libraries(${TARGET_NAME}_s PRIVATE fluid |
207 | PRIVATE ngraph | 205 | PRIVATE ngraph |
208 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt | 206 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt |
209 | index 5a4b259..7208a0f 100644 | 207 | index 54de20f..4ea20f5 100644 |
210 | --- a/inference-engine/thirdparty/CMakeLists.txt | 208 | --- a/inference-engine/thirdparty/CMakeLists.txt |
211 | +++ b/inference-engine/thirdparty/CMakeLists.txt | 209 | +++ b/inference-engine/thirdparty/CMakeLists.txt |
212 | @@ -7,12 +7,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") | 210 | @@ -35,10 +35,6 @@ function(build_with_lto) |
213 | set(CMAKE_CC_FLAGS "${CMAKE_CC_FLAGS} -Wno-unknown-warning-option -Wno-inconsistent-missing-override -Wno-pass-failed") | 211 | set(CMAKE_RANLIB "gcc-ranlib") |
214 | endif() | 212 | endif() |
215 | 213 | ||
216 | -add_subdirectory(pugixml) | 214 | - add_subdirectory(pugixml) |
217 | -export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake") | 215 | - export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake") |
218 | -export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") | 216 | - export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") |
219 | - | 217 | - |
220 | add_subdirectory(stb_lib) | 218 | if (TARGET pugixml_mt) |
221 | -add_subdirectory(ade) | 219 | export(TARGETS pugixml_mt NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake") |
220 | export(TARGETS pugixml_mt NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") | ||
221 | @@ -46,11 +42,6 @@ function(build_with_lto) | ||
222 | 222 | ||
223 | if (ENABLE_CLDNN) | 223 | add_subdirectory(stb_lib) |
224 | set(CLDNN__OUTPUT_BIN_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) | ||
225 | @@ -40,8 +35,6 @@ if (UNIX OR APPLE AND ${CMAKE_BUILD_TYPE} STREQUAL "Release") | ||
226 | add_definitions(-fvisibility=default) | ||
227 | endif() | ||
228 | 224 | ||
229 | -include(ngraph.cmake) | 225 | - add_subdirectory(ade) |
226 | - export(TARGETS ade NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") | ||
227 | - | ||
228 | - include(ngraph.cmake) | ||
230 | - | 229 | - |
231 | if (UNIX OR APPLE AND ${CMAKE_BUILD_TYPE} STREQUAL "Release") | 230 | add_subdirectory(fluid/modules/gapi) |
232 | remove_definitions(-fvisibility=default) | 231 | export(TARGETS fluid NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") |
233 | add_definitions(-fvisibility=hidden) | 232 | endfunction() |
234 | -- | 233 | -- |
235 | 2.23.0 | 234 | 2.7.4 |
236 | 235 | ||