From 31be4817448828a5519f6742cd185512bbca5586 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Wed, 4 May 2022 10:14:14 +0800 Subject: [PATCH] rename base folder --- build.sh | 9 +++++---- hgdriver/ImageProcess/CMakeLists.txt | 2 +- hgdriver/hgdev/CMakeLists.txt | 4 ++-- hgdriver/wrapper/CMakeLists.txt | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build.sh b/build.sh index eee5417..3e9d975 100644 --- a/build.sh +++ b/build.sh @@ -4,30 +4,31 @@ cd build mkdir imgpc cd imgpc rm -rf * -cmake ../../device/hgdriver/ImageProcess +cmake ../../code_device/hgdriver/ImageProcess make cd .. mkdir hgdev cd hgdev rm -rf * -cmake ../../device/hgdriver/hgdev +cmake ../../code_device/hgdriver/hgdev make cd .. mkdir wrapper cd wrapper rm -rf * -cmake ../../device/hgdriver/wrapper +cmake ../../code_device/hgdriver/wrapper make cd .. mkdir hgsane cd hgsane rm -rf * -cmake ../../device/hgsane +cmake ../../code_device/hgsane make sudo cp ../../release/Linux/x86_64/libsane-hgsane.so /usr/lib/x86_64-linux-gnu/sane/libsane-hgsane.so.1 + diff --git a/hgdriver/ImageProcess/CMakeLists.txt b/hgdriver/ImageProcess/CMakeLists.txt index d118449..2ea22b5 100644 --- a/hgdriver/ImageProcess/CMakeLists.txt +++ b/hgdriver/ImageProcess/CMakeLists.txt @@ -27,4 +27,4 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include ) -set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../../tmp/) +set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../../build/) diff --git a/hgdriver/hgdev/CMakeLists.txt b/hgdriver/hgdev/CMakeLists.txt index cdc46e2..83191bd 100644 --- a/hgdriver/hgdev/CMakeLists.txt +++ b/hgdriver/hgdev/CMakeLists.txt @@ -9,7 +9,7 @@ set(DIR_SRCS ${DIR_SRCS} ${DIR_HEADS}) add_library(${PROJECT_NAME} STATIC ${DIR_SRCS}) target_link_libraries(${PROJECT_NAME} PRIVATE - ${PROJECT_SOURCE_DIR}/../../../tmp/libgimgproc.a + ${PROJECT_SOURCE_DIR}/../../../build/libgimgproc.a ${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/libopencv_world.a ${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/libittnotify.a ${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/liblibjasper.a @@ -31,4 +31,4 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include ${PROJECT_SOURCE_DIR}/../../../sdk/include ) -set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../../tmp/) +set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../../build/) diff --git a/hgdriver/wrapper/CMakeLists.txt b/hgdriver/wrapper/CMakeLists.txt index 38e21e3..6a7145e 100644 --- a/hgdriver/wrapper/CMakeLists.txt +++ b/hgdriver/wrapper/CMakeLists.txt @@ -17,8 +17,8 @@ message(STATUS ${CMAKE_SYSTEM_PROCESSOR}) message(STATUS ${CMAKE_HOST_SYSTEM_NAME}) target_link_libraries(${PROJECT_NAME} PRIVATE - ${PROJECT_SOURCE_DIR}/../../../tmp/libgdev.a - ${PROJECT_SOURCE_DIR}/../../../tmp/libgimgproc.a + ${PROJECT_SOURCE_DIR}/../../../build/libgdev.a + ${PROJECT_SOURCE_DIR}/../../../build/libgimgproc.a ${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/libopencv_world.a ${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/libIlmImf.a ${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/libittnotify.a