Skip to content

Commit

Permalink
Windows: debug opensubdiv
Browse files Browse the repository at this point in the history
  • Loading branch information
howetuft committed Jan 19, 2025
1 parent 8c6c1b8 commit 23d9e99
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ jobs:
strategy:
fail-fast: false
matrix:
python-minor: [8, 9, 10, 11, 12, 13]
#python-minor: [8, 9, 10, 11, 12, 13]
os: [ubuntu-latest, windows-latest, macos-13, macos-14]
python-minor: [ 9 ]
#python-minor: [ 12]
#os: [ubuntu-latest]
#python-minor: [ 11]
Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ set_property(TARGET pyluxcore PROPERTY CXX_STANDARD 17)
target_link_options(pyluxcore PRIVATE $<$<BOOL:${HAVE_SANITIZER}>:-fsanitize=address>)

if(APPLE)
target_link_libraries(opensubdiv PRIVATE llvm-openmp::llvm-openmp)
# TODO
#target_link_libraries(opensubdiv PRIVATE llvm-openmp::llvm-openmp)
target_link_libraries(bcd PRIVATE llvm-openmp::llvm-openmp)
target_link_libraries(slg-core PRIVATE llvm-openmp::llvm-openmp)
target_link_libraries(pyluxcore PRIVATE llvm-openmp::llvm-openmp)
Expand Down
6 changes: 6 additions & 0 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@ def generate(self):
buildenv.generate()
tc.presets_build_environment = buildenv.environment()

# OpenMP for Windows
if self.settings.os == "Windows":
# opensubdiv looks for OPENMP_FOUND whereas FindOpenMP
# provides OpenMP_FOUND.
tc.cache_variables["OPENMP_FOUND"] = True

tc.generate()

cd = CMakeDeps(self)
Expand Down
1 change: 1 addition & 0 deletions scripts/install_conan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ fi
echo "::group::CIBW_BEFORE_BUILD: restore conan cache"
# Restore conan cache (add -vverbose to debug)
conan cache restore $cache_dir/conan-cache-save.tgz
# TODO
conan cache clean "opensubdiv/*" --download --source --build --temp
echo "::endgroup::"

Expand Down

0 comments on commit 23d9e99

Please sign in to comment.