Skip to content

Commit fee9b4c

Browse files
aobolenskaobolensk
committed
3p
1 parent acba1bb commit fee9b4c

File tree

8 files changed

+33
-29
lines changed

8 files changed

+33
-29
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
4040
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
4141
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
42-
-DOPENCV_PATH=3rdparty/opencv/build \
42+
-DOPENCV_PATH=build/3rdparty/opencv_build \
4343
${{ matrix.stats && '-DENABLE_STATISTIC_TENSORS=ON' || '' }} \
4444
${{ matrix.stats && '-DENABLE_STATISTIC_TIME=ON' || '' }} \
4545
${{ matrix.stats && '-DENABLE_STATISTIC_WEIGHTS=ON' || '' }}
@@ -49,7 +49,7 @@ jobs:
4949
- name: Prepare OpenCV libs
5050
run: |
5151
mkdir -p build/bin/opencv_libs
52-
cp -a 3rdparty/opencv/build/lib/libopencv_* build/bin/opencv_libs/
52+
cp -a build/3rdparty/opencv_build/lib/libopencv_* build/bin/opencv_libs/
5353
echo "Library permissions after copy:"
5454
stat -c "%A %n" build/bin/opencv_libs/libopencv_imgcodecs.so*
5555

‎CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ include_directories("include")
2828

2929
add_subdirectory(3rdparty)
3030

31+
include(cmake/opencv_config.cmake)
32+
3133
if (NOT WIN32)
3234
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
3335
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")

‎app/Accuracy/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ add_library(ACCLib STATIC ${INCLUDE_HEADERS} ${SRC_FILES})
44

55
set_target_properties(ReadLib PROPERTIES LINKER_LANGUAGE CXX)
66

7-
find_package( OpenCV REQUIRED PATHS "${CMAKE_SOURCE_DIR}/3rdparty/opencv/build" )
7+
find_package( OpenCV REQUIRED PATHS "${OPENCV_BUILD_DIR}" )
88
include_directories( ${OpenCV_INCLUDE_DIRS} )
99
target_link_libraries( ACCLib ${OpenCV_LIBS} )
1010
target_link_libraries( ACCLib TBB_unified)

‎app/AccuracyImgNet/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
add_executable(ACCImgNet accimgnet.cpp)
22

3-
find_package( OpenCV REQUIRED PATHS "${CMAKE_SOURCE_DIR}/3rdparty/opencv/build" )
3+
find_package( OpenCV REQUIRED PATHS "${OPENCV_BUILD_DIR}" )
44
include_directories( ${OpenCV_INCLUDE_DIRS} )
55
target_link_libraries( ACCImgNet ${OpenCV_LIBS} )
66
target_link_libraries( ACCImgNet TBB_unified)

‎app/Graph/CMakeLists.txt‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
1-
file(MAKE_DIRECTORY "${CMAKE_SOURCE_DIR}/3rdparty/opencv/build")
2-
3-
execute_process(
4-
COMMAND ${CMAKE_COMMAND} -S "${CMAKE_SOURCE_DIR}/3rdparty/opencv" -B "${CMAKE_SOURCE_DIR}/3rdparty/opencv/build" -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DBUILD_opencv_apps=OFF
5-
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/3rdparty/opencv/build"
6-
)
7-
execute_process(
8-
COMMAND ${CMAKE_COMMAND} --build "${CMAKE_SOURCE_DIR}/3rdparty/opencv/build" --config "${CMAKE_BUILD_TYPE}"
9-
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/3rdparty/opencv/build"
10-
)
111
set(INCLUDE_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/build.hpp")
122
set(SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/build.cpp")
133
add_library(BuildGraph STATIC ${INCLUDE_HEADERS} ${SRC_FILES})
144

155
set_target_properties(BuildGraph PROPERTIES LINKER_LANGUAGE CXX)
166

17-
find_package(OpenCV REQUIRED PATHS "${CMAKE_SOURCE_DIR}/3rdparty/opencv/build")
7+
find_package(OpenCV REQUIRED PATHS "${OPENCV_BUILD_DIR}")
188
include_directories(${OpenCV_INCLUDE_DIRS})
199

2010
target_link_libraries(BuildGraph PUBLIC ${OpenCV_LIBS})
@@ -44,7 +34,7 @@ if (WIN32)
4434
endif()
4535
add_custom_command(TARGET Graph_Build POST_BUILD
4636
COMMAND ${CMAKE_COMMAND} -E copy_directory
47-
"${CMAKE_SOURCE_DIR}/3rdparty/opencv/build/bin/${CMAKE_BUILD_TYPE}/."
37+
"${OPENCV_BUILD_DIR}/bin/${CMAKE_BUILD_TYPE}/."
4838
"${CMAKE_BINARY_DIR}/bin/")
4939
endif()
5040

@@ -57,7 +47,7 @@ if (WIN32)
5747
endif()
5848
add_custom_command(TARGET ACC_MNIST POST_BUILD
5949
COMMAND ${CMAKE_COMMAND} -E copy_directory
60-
"${CMAKE_SOURCE_DIR}/3rdparty/opencv/build/bin/${CMAKE_BUILD_TYPE}/."
50+
"${OPENCV_BUILD_DIR}/bin/${CMAKE_BUILD_TYPE}/."
6151
"${CMAKE_BINARY_DIR}/bin/")
6252
endif()
6353

‎app/ReaderImage/CMakeLists.txt‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
file(MAKE_DIRECTORY "${CMAKE_SOURCE_DIR}/3rdparty/opencv/build")
2-
3-
execute_process(
4-
COMMAND ${CMAKE_COMMAND} -S "${CMAKE_SOURCE_DIR}/3rdparty/opencv" -B "${CMAKE_SOURCE_DIR}/3rdparty/opencv/build" -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DBUILD_opencv_apps=OFF
5-
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/3rdparty/opencv/build"
6-
)
7-
execute_process(
8-
COMMAND ${CMAKE_COMMAND} --build "${CMAKE_SOURCE_DIR}/3rdparty/opencv/build" --config "${CMAKE_BUILD_TYPE}"
9-
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/3rdparty/opencv/build"
10-
)
1+
file(MAKE_DIRECTORY "${OPENCV_BUILD_DIR}")
112

123
set(INCLUDE_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/reader_img.hpp")
134
set(SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/reader_img_s.cpp")
@@ -16,7 +7,7 @@ add_library(ReadLib STATIC ${INCLUDE_HEADERS} ${SRC_FILES})
167

178
set_target_properties(ReadLib PROPERTIES LINKER_LANGUAGE CXX)
189

19-
find_package( OpenCV REQUIRED PATHS "${CMAKE_SOURCE_DIR}/3rdparty/opencv/build" )
10+
find_package( OpenCV REQUIRED PATHS "${OPENCV_BUILD_DIR}" )
2011
include_directories( ${OpenCV_INCLUDE_DIRS} )
2112
target_link_libraries( ReadLib ${OpenCV_LIBS} )
2213
target_link_libraries( ReadLib TBB_unified)

‎cmake/opencv_config.cmake‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
set(OPENCV_BUILD_DIR "${CMAKE_BINARY_DIR}/3rdparty/opencv_build")
2+
file(MAKE_DIRECTORY "${OPENCV_BUILD_DIR}")
3+
4+
execute_process(
5+
COMMAND ${CMAKE_COMMAND}
6+
-S "${CMAKE_SOURCE_DIR}/3rdparty/opencv"
7+
-B "${OPENCV_BUILD_DIR}"
8+
-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}
9+
-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
10+
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
11+
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
12+
-DBUILD_PERF_TESTS=OFF
13+
-DBUILD_TESTS=OFF
14+
-DBUILD_opencv_apps=OFF
15+
WORKING_DIRECTORY "${OPENCV_BUILD_DIR}"
16+
)
17+
18+
execute_process(
19+
COMMAND ${CMAKE_COMMAND} --build "${OPENCV_BUILD_DIR}" --config "${CMAKE_BUILD_TYPE}"
20+
WORKING_DIRECTORY "${OPENCV_BUILD_DIR}"
21+
)

‎test/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if (WIN32)
2929
endif()
3030
add_custom_command(TARGET run_test POST_BUILD
3131
COMMAND ${CMAKE_COMMAND} -E copy_directory
32-
"${CMAKE_SOURCE_DIR}/3rdparty/opencv/build/bin/${CMAKE_BUILD_TYPE}/."
32+
"${OPENCV_BUILD_DIR}/bin/${CMAKE_BUILD_TYPE}/."
3333
"${CMAKE_BINARY_DIR}/bin/")
3434
endif()
3535

0 commit comments

Comments
 (0)