Skip to content

Mac link error #25

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

Merged
AurelienBesnier merged 6 commits into from
Jan 12, 2026
Merged

Mac link error #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5507642
Looking up potential libnames
AurelienBesnier Jan 12, 2026
279e721
Using different libs
AurelienBesnier Jan 12, 2026
eeee089
Using common lib for all os
AurelienBesnier Jan 12, 2026
c538345
Test without flag
AurelienBesnier Jan 12, 2026
2a7b328
Test without if block
AurelienBesnier Jan 12, 2026
6ac7c39
Test with old sdk support
AurelienBesnier Jan 12, 2026
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
23 changes: 0 additions & 23 deletions .github/workflows/conda-package-build.yml
View file
Open in desktop

This file was deleted.

16 changes: 5 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ if(NOT OpenMP_CXX_FOUND)
message(WARNING "failed to find OpenMP")
endif()

# apple newer C++ features with old SDK
if(APPLE)
set(CMAKE_CXX_FLAGS "${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY")
endif()

# Embree4
find_package(embree 4.0 REQUIRED)
if (${embree_FOUND})
Expand All @@ -24,17 +29,6 @@ else()
message(FATAL_ERROR "Could not find Embree")
endif()

# OpenMP
if(APPLE)
set(CMAKE_CXX_COMPILER clang++)
set(CMAKE_CXX_FLAGS "${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY")

if(CMAKE_CXX_COMPILER_ID MATCHES "Clang\$")
set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp")
set(OpenMP_CXX_LIB_NAMES "omp")
set(OpenMP_omp_LIBRARY omp)
endif()
endif()

# externals
add_subdirectory("externals")
Expand Down
Loading