Merge branch 'develop' into 'master'

Fix configuration files

See merge request schihei/sample-colorization!1
This commit is contained in:
Salli Moustafa
2021-01-12 13:28:48 +01:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -1 +1 @@
[{"name":"Build-Configuration","type":"AscendAppBuild","lastBuild":true,"buildProperties":{"HOST_OS":"Euleros2.8","HOST_ARCH":"aarch64","TARGET_TYPE":"SOC"}}]
[{"name":"Build-Configuration","type":"AscendAppBuild","lastBuild":true,"buildProperties":{"HOST_OS":"Centos7.6","HOST_ARCH":"aarch64","TARGET_TYPE":"SOC"}}]
+1 -1
View File
@@ -4,5 +4,5 @@
"project_desc": "",
"target": "",
"target_id": "",
"adk_version": "1.73.T5.0.B050"
"adk_version": "1.73.5.1.B050"
}
+1 -1
View File
@@ -14,7 +14,7 @@ add_definitions(-DENABLE_DVPP_INTERFACE)
# Specify target generation path
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../../../out")
set(OPENCV_PATH "/usr/local")
set(OPENCV_PATH "/home/ascend/ascend_ddk/arm")
set(INC_PATH $ENV{DDK_PATH})
if (NOT DEFINED ENV{DDK_PATH})