Skip to content

TBB with fallback in CMakeLists.txt - for Ubuntu24 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vfxandy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

TBB with fallback in CMakeLists.txt - for Ubuntu24 #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 30 additions & 12 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,23 +88,31 @@ add_executable(extract_profile


if (WITH_AWS_SDK)
target_link_libraries(extract_profile ${AWSSDK_LINK_LIBRARIES} ${AWSSDK_PLATFORM_DEPS})
target_link_libraries(extract_profile PRIVATE ${AWSSDK_LINK_LIBRARIES} ${AWSSDK_PLATFORM_DEPS})
endif (WITH_AWS_SDK)

target_link_libraries(extract_profile laszip)
target_link_libraries(extract_profile brotlienc-static)
target_link_libraries(extract_profile brotlidec-static)
target_link_libraries(extract_profile PRIVATE laszip brotlienc-static brotlidec-static)

target_include_directories(extract_profile PRIVATE "./include")
target_include_directories(extract_profile PRIVATE "./modules")
target_include_directories(extract_profile PRIVATE "./libs")

if (UNIX)
find_package(Threads REQUIRED)
# find_package(TBB REQUIRED)

target_link_libraries(extract_profile Threads::Threads)
# target_link_libraries(extract_profile tbb)
# Try to find modern TBB CMake package first
find_package(TBB QUIET)
if (TBB_FOUND)
target_link_libraries(extract_profile PRIVATE Threads::Threads TBB::tbb)
else()
# Fallback: try to link libtbb directly (system package name 'tbb')
find_library(TBB_LIB NAMES tbb tbb_debug tbb_static)
if (TBB_LIB)
target_link_libraries(extract_profile PRIVATE Threads::Threads ${TBB_LIB})
else()
message(WARNING "TBB not found. If you see undefined references to tbb symbols, install Intel TBB and re-run CMake.")
target_link_libraries(extract_profile PRIVATE Threads::Threads)
endif()
endif()
endif (UNIX)

buildLicenses(extract_profile)
Expand Down Expand Up @@ -137,10 +145,20 @@ target_include_directories(extract_area PRIVATE "./libs")

if (UNIX)
find_package(Threads REQUIRED)
# find_package(TBB REQUIRED)

target_link_libraries(extract_area Threads::Threads)
# target_link_libraries(extract_area tbb)
# Try to find modern TBB CMake package first
find_package(TBB QUIET)
if (TBB_FOUND)
target_link_libraries(extract_area PRIVATE Threads::Threads TBB::tbb)
else()
# Fallback: try to link libtbb directly
find_library(TBB_LIB NAMES tbb tbb_debug tbb_static)
if (TBB_LIB)
target_link_libraries(extract_area PRIVATE Threads::Threads ${TBB_LIB})
else()
message(WARNING "TBB not found. If you see undefined references to tbb symbols, install Intel TBB and re-run CMake.")
target_link_libraries(extract_area PRIVATE Threads::Threads)
endif()
endif()
endif (UNIX)

buildLicenses(extract_area)
Expand Down