Skip to content

Commit 382260c

Browse files
author
Alexander Nesterov
committed
Added TBB DLL on Windows
1 parent ab6d627 commit 382260c

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if( WIN32 )
2929
set(SYSTEM_BIT "ia32")
3030
endif()
3131

32-
file( GLOB TBB_PRE_LIB "${tbb_root}/lib/${SYSTEM_BIT}/vc14/*.lib" )
32+
file( GLOB TBB_PRE_LIB "${tbb_root}/bin/${SYSTEM_BIT}/vc14/*.dll" )
3333
file( COPY ${TBB_PRE_LIB} DESTINATION "${CMAKE_BINARY_DIR}/bin")
3434

3535
find_package( TBB )

modules/test_tasks/tbb/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ message( STATUS "-- " ${PROJECT_NAME} )
44
add_executable( ${PROJECT_NAME} main.cpp )
55

66
if( WIN32 )
7-
file( GLOB TBB_PRE_LIB "${tbb_root}/lib/${SYSTEM_BIT}/vc14/*.lib" )
8-
target_link_libraries(${PROJECT_NAME} ${TBB_IMPORTED_TARGETS} ${TBB_PRE_LIB})
7+
target_link_libraries(${PROJECT_NAME} ${TBB_IMPORTED_TARGETS})
98
else( WIN32 )
109
target_link_libraries(${PROJECT_NAME} ${TBB_LIBRARIES})
1110
endif( WIN32 )

0 commit comments

Comments
 (0)