Skip to content

Commit a5bab12

Browse files
committed
Boh non va
1 parent b81d14d commit a5bab12

File tree

2 files changed

+2
-25
lines changed

2 files changed

+2
-25
lines changed

.github/workflows/cmake_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
if: matrix.os == 'ubuntu-latest'
2323
run: |
2424
sudo apt update
25-
sudo apt install -y lcov gcovr build-essential cmake libhwloc-dev libtbb-dev
25+
sudo apt install -y lcov gcovr build-essential cmake libtbb-dev
2626
2727
- name: Install dependencies on macOS
2828
if: matrix.os == 'macos-latest'

CMakeLists.txt

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ if(NOT simdjson_POPULATED)
130130
FetchContent_MakeAvailable(simdjson)
131131
endif()
132132
# Check if the user has TBB installed
133-
find_package(TBB REQUIRED)
133+
find_package(TBB REQUIRED CONFIG)
134134

135135
add_library(dsf STATIC ${SOURCES})
136136
target_compile_definitions(dsf PRIVATE SPDLOG_USE_STD_FORMAT)
@@ -198,29 +198,6 @@ if(BUILD_PYTHON_BINDINGS)
198198
target_include_directories(dsf_python_module
199199
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
200200

201-
# if(APPLE)
202-
# # Try to detect Homebrew prefix dynamically
203-
# execute_process(
204-
# COMMAND brew --prefix
205-
# OUTPUT_VARIABLE HOMEBREW_PREFIX
206-
# OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
207-
# if(HOMEBREW_PREFIX)
208-
# set(HOMEBREW_LIB "${HOMEBREW_PREFIX}/lib")
209-
# else()
210-
# # Fallback to default Homebrew locations
211-
# set(HOMEBREW_LIB "/opt/homebrew/lib;/usr/local/lib")
212-
# endif()
213-
# set_target_properties(
214-
# dsf_python_module
215-
# PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE
216-
# INSTALL_RPATH "${HOMEBREW_LIB};@loader_path"
217-
# INSTALL_RPATH_USE_LINK_PATH TRUE)
218-
# elseif(UNIX)
219-
# set_target_properties(
220-
# dsf_python_module
221-
# PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE
222-
# INSTALL_RPATH "$ORIGIN")
223-
# endif()
224201
endif()
225202

226203
# Tests

0 commit comments

Comments
 (0)