From 2ff7b10adcc1e08a3b576f74d11d9bfb1bb3647e Mon Sep 17 00:00:00 2001 From: DefTruth <31974251+DefTruth@users.noreply.github.com> Date: Tue, 21 Mar 2023 10:41:34 +0800 Subject: [PATCH] [cmake] switch paddle 2.4-dev7 -> 2.4-dev6 for windows (#1660) * [cmake] switch paddle 2.4-dev7 -> 2.4-dev6 for windows * [cmake] remove examples from install policy * Update CMakeLists.txt --- CMakeLists.txt | 19 ------------------- cmake/paddle_inference.cmake | 1 + 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 47da62291..332f382da 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -559,25 +559,6 @@ if(NOT ANDROID) DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/third_libs/install DESTINATION ${CMAKE_INSTALL_PREFIX}/third_libs ) - if(WIN32) - install( - DIRECTORY ${PROJECT_SOURCE_DIR}/examples/vision - DESTINATION ${CMAKE_INSTALL_PREFIX}/examples - ) - install( - DIRECTORY ${PROJECT_SOURCE_DIR}/examples/text - DESTINATION ${CMAKE_INSTALL_PREFIX}/examples - ) - install( - DIRECTORY ${PROJECT_SOURCE_DIR}/examples/runtime - DESTINATION ${CMAKE_INSTALL_PREFIX}/examples - ) - else() - install( - DIRECTORY ${PROJECT_SOURCE_DIR}/examples - DESTINATION ${CMAKE_INSTALL_PREFIX} - ) - endif() else() set_android_third_libs_installation() endif() diff --git a/cmake/paddle_inference.cmake b/cmake/paddle_inference.cmake index fc9cbd8e1..ea1fad6c8 100755 --- a/cmake/paddle_inference.cmake +++ b/cmake/paddle_inference.cmake @@ -82,6 +82,7 @@ else() set(PADDLEINFERENCE_URL_BASE "https://bj.bcebos.com/fastdeploy/third_libs/") set(PADDLEINFERENCE_VERSION "2.4-dev7") if(WIN32) + set(PADDLEINFERENCE_VERSION "2.4-dev6") # dev7 for win is not ready now! if (WITH_GPU) set(PADDLEINFERENCE_FILE "paddle_inference-win-x64-gpu-trt-${PADDLEINFERENCE_VERSION}.zip") else()