Skip to content

Commit 56033d6

Browse files
committed
Remove extra TBB build
1 parent adaa1da commit 56033d6

2 files changed

Lines changed: 2 additions & 14 deletions

File tree

3rdparty/CMakeLists.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
11
add_subdirectory(googletest)
2-
3-
file(MAKE_DIRECTORY "${CMAKE_SOURCE_DIR}/3rdparty/TBB/build")
4-
5-
execute_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} -DTBB_OUTPUT_DIR_BASE=tbb
7-
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/3rdparty/TBB/build"
8-
)
9-
execute_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"
12-
)
13-
142
option(TBB_TEST OFF)
153
add_subdirectory(TBB)

src/layers/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ if (WIN32)
66
string(TOLOWER ${CMAKE_BUILD_TYPE} lower_build)
77
file(GLOB_RECURSE tbb_files "${CMAKE_SOURCE_DIR}/3rdparty/TBB/build/tbb_${lower_build}/tbb*")
88
add_custom_command(TARGET layers_lib POST_BUILD
9-
COMMAND ${CMAKE_COMMAND} -E copy
9+
COMMAND ${CMAKE_COMMAND} -E copy_directory
1010
${tbb_files}
1111
"${CMAKE_BINARY_DIR}/bin/")
1212
else()
1313
file(GLOB_RECURSE tbb_files "${CMAKE_SOURCE_DIR}/3rdparty/TBB/build/tbb_debug/tbb*")
1414
add_custom_command(TARGET layers_lib POST_BUILD
15-
COMMAND ${CMAKE_COMMAND} -E copy
15+
COMMAND ${CMAKE_COMMAND} -E copy_directory
1616
${tbb_files}
1717
"${CMAKE_BINARY_DIR}/bin/")
1818
endif()

0 commit comments

Comments
 (0)