File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1- add_subdirectory (googletest )
2-
3- file (MAKE_DIRECTORY "${CMAKE_SOURCE_DIR } /3rdparty/TBB/build" )
4-
51execute_process (
6- COMMAND ${CMAKE_COMMAND } -S "${CMAKE_SOURCE_DIR } /3rdparty/TBB" -B "${CMAKE_SOURCE_DIR } /3rdparty/TBB/build" -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
7- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR } /3rdparty/TBB/build"
2+ COMMAND ${CMAKE_COMMAND }
3+ -S "${CMAKE_SOURCE_DIR } /3rdparty/opencv" -B "${CMAKE_SOURCE_DIR } /3rdparty/opencv/build"
4+ -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
5+ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
6+ -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DBUILD_opencv_apps=OFF
87)
98execute_process (
10- COMMAND ${CMAKE_COMMAND } --build "${CMAKE_SOURCE_DIR } /3rdparty/TBB/build" --config "${CMAKE_BUILD_TYPE } "
11- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR } /3rdparty/TBB/build"
9+ COMMAND ${CMAKE_COMMAND } --build "${CMAKE_SOURCE_DIR } /3rdparty/opencv/build" --config "${CMAKE_BUILD_TYPE } "
1210)
1311
14- option (TBB_TEST OFF )
15- add_subdirectory (TBB )
12+ execute_process (
13+ COMMAND ${CMAKE_COMMAND }
14+ -S "${CMAKE_SOURCE_DIR } /3rdparty/TBB" -B "${CMAKE_SOURCE_DIR } /3rdparty/TBB/build"
15+ -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
16+ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
17+ -DCMAKE_INSTALL_PREFIX= "${CMAKE_SOURCE_DIR } /3rdparty/TBB/install"
18+ -DTBB_TEST=OFF
19+ )
20+ execute_process (
21+ COMMAND ${CMAKE_COMMAND } --build "${CMAKE_SOURCE_DIR } /3rdparty/TBB/build" --config "${CMAKE_BUILD_TYPE } " -t install
22+ )
Original file line number Diff line number Diff line change 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- )
11-
121set (INCLUDE_HEADERS "${CMAKE_CURRENT_SOURCE_DIR } /reader_img.hpp" )
132set (SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR } /reader_img_s.cpp" )
143add_library (ReadLib STATIC ${INCLUDE_HEADERS} ${SRC_FILES} )
@@ -17,9 +6,10 @@ add_library(ReadLib STATIC ${INCLUDE_HEADERS} ${SRC_FILES})
176set_target_properties (ReadLib PROPERTIES LINKER_LANGUAGE CXX)
187
198find_package ( OpenCV REQUIRED PATHS "${CMAKE_SOURCE_DIR } /3rdparty/opencv/build" )
9+ find_package ( TBB REQUIRED PATHS "${CMAKE_SOURCE_DIR } /3rdparty/TBB/install" )
2010include_directories ( ${OpenCV_INCLUDE_DIRS} )
2111target_link_libraries ( ReadLib ${OpenCV_LIBS} )
22- target_link_libraries ( ReadLib TBB::tbb )
12+ target_link_libraries ( ReadLib ${TBB_IMPORTED_TARGETS} )
2313
2414add_executable (Reader reader_img.cpp )
2515target_link_libraries (Reader ReadLib )
You can’t perform that action at this time.
0 commit comments