From d855c28073817f75f2bab4357b9b258b627c42bb Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 27 Sep 2022 14:16:34 +0800 Subject: [PATCH] Rename third libraries' name (#286) * Rename third libraries' name * remove existing directory --- cmake/opencv.cmake | 5 +++++ cmake/openvino.cmake | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/cmake/opencv.cmake b/cmake/opencv.cmake index a95f0ddd3..d2c2d320e 100644 --- a/cmake/opencv.cmake +++ b/cmake/opencv.cmake @@ -123,6 +123,11 @@ else() # Win/Linux/Mac else() 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}/) if (WIN32) set(OpenCV_DIR ${OpenCV_DIR}/build/) diff --git a/cmake/openvino.cmake b/cmake/openvino.cmake index 33d513942..9eac242fb 100644 --- a/cmake/openvino.cmake +++ b/cmake/openvino.cmake @@ -41,6 +41,17 @@ else() endif() 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_INC_DIR "${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. 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) file(GLOB_RECURSE OPENVINO_LIB_FILES ${OPENVINO_INSTALL_DIR}/lib/intel64/Release/*) file(COPY ${OPENVINO_LIB_FILES} DESTINATION ${OPENVINO_INSTALL_DIR}/lib/) @@ -92,4 +99,4 @@ else() get_openvino_libs(${OPENVINO_INSTALL_DIR}) endif() message("OPENVINO_LIBS = ${OPENVINO_LIBS}") -list(APPEND DEPEND_LIBS ${OPENVINO_LIBS}) \ No newline at end of file +list(APPEND DEPEND_LIBS ${OPENVINO_LIBS})