apps/FastDeploy
1
0
Fork 0
mirror of https://github.com/PaddlePaddle/FastDeploy.git synced 2025-10-27 18:41:02 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Rename third libraries' name (#286)

Browse Source 
* Rename third libraries' name

* remove existing directory
This commit is contained in:
Jason
2022-09-27 14:16:34 +08:00
committed by GitHub
parent 69be5b5232
commit d855c28073
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/opencv.cmake
View File

@@ -123,6 +123,11 @@ else()
# Win/Linux/Mac # Win/Linux/Mac
else() else()
download_and_decompress(${OPENCV_URL} ${CMAKE_CURRENT_BINARY_DIR}/${OPENCV_FILENAME}${COMPRESSED_SUFFIX} ${THIRD_PARTY_PATH}/install/) download_and_decompress(${OPENCV_URL} ${CMAKE_CURRENT_BINARY_DIR}/${OPENCV_FILENAME}${COMPRESSED_SUFFIX} ${THIRD_PARTY_PATH}/install/)
if(EXISTS ${THIRD_PARTY_PATH}/install/opencv)
file(REMOVE_RECURSE ${THIRD_PARTY_PATH}/install/opencv)
endif()
file(RENAME ${THIRD_PARTY_PATH}/install/${OPENCV_FILENAME}/ ${THIRD_PARTY_PATH}/install/opencv)
set(OPENCV_FILENAME opencv)
set(OpenCV_DIR ${THIRD_PARTY_PATH}/install/${OPENCV_FILENAME}/) set(OpenCV_DIR ${THIRD_PARTY_PATH}/install/${OPENCV_FILENAME}/)
if (WIN32) if (WIN32)
set(OpenCV_DIR ${OpenCV_DIR}/build/) set(OpenCV_DIR ${OpenCV_DIR}/build/)

15
cmake/openvino.cmake
View File

@@ -41,6 +41,17 @@ else()
endif() endif()
set(OPENVINO_URL "${OPENVINO_URL_PREFIX}${OPENVINO_FILENAME}${COMPRESSED_SUFFIX}") set(OPENVINO_URL "${OPENVINO_URL_PREFIX}${OPENVINO_FILENAME}${COMPRESSED_SUFFIX}")
download_and_decompress(${OPENVINO_URL}
${CMAKE_CURRENT_BINARY_DIR}/${OPENVINO_FILENAME}${COMPRESSED_SUFFIX}
${THIRD_PARTY_PATH}/install)
if(EXISTS ${THIRD_PARTY_PATH}/install/openvino)
file(REMOVE_RECURSE ${THIRD_PARTY_PATH}/install/openvino)
endif()
file(RENAME ${THIRD_PARTY_PATH}/install/${OPENVINO_FILENAME} ${THIRD_PARTY_PATH}/install/openvino)
set(OPENVINO_FILENAME openvino)
set(OPENVINO_INSTALL_DIR ${THIRD_PARTY_PATH}/install/${OPENVINO_FILENAME}/runtime) set(OPENVINO_INSTALL_DIR ${THIRD_PARTY_PATH}/install/${OPENVINO_FILENAME}/runtime)
set(OPENVINO_INSTALL_INC_DIR set(OPENVINO_INSTALL_INC_DIR
"${OPENVINO_INSTALL_DIR}/include" "${OPENVINO_INSTALL_DIR}/include"
@@ -56,10 +67,6 @@ set(CMAKE_BUILD_RPATH "${CMAKE_BUILD_RPATH}" "${OPENVINO_LIB_DIR}")
# For OPENVINO code to include internal headers. # For OPENVINO code to include internal headers.
include_directories(${OPENVINO_INSTALL_INC_DIR}) include_directories(${OPENVINO_INSTALL_INC_DIR})
download_and_decompress(${OPENVINO_URL}
${CMAKE_CURRENT_BINARY_DIR}/${OPENVINO_FILENAME}${COMPRESSED_SUFFIX}
${THIRD_PARTY_PATH}/install)
if(WIN32) if(WIN32)
file(GLOB_RECURSE OPENVINO_LIB_FILES ${OPENVINO_INSTALL_DIR}/lib/intel64/Release/*) file(GLOB_RECURSE OPENVINO_LIB_FILES ${OPENVINO_INSTALL_DIR}/lib/intel64/Release/*)
file(COPY ${OPENVINO_LIB_FILES} DESTINATION ${OPENVINO_INSTALL_DIR}/lib/) file(COPY ${OPENVINO_LIB_FILES} DESTINATION ${OPENVINO_INSTALL_DIR}/lib/)