Skip to content

Commit

Permalink
refactor(cmake/python): lib folder conditions
Browse files Browse the repository at this point in the history
  • Loading branch information
Curve committed Mar 18, 2024
1 parent ceac1da commit 45aa536
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ jobs:
./venv/bin/python -c "import viennaps2d; print(viennaps2d.__doc__)"
- name: 📦 Upload Artifact
if: always()
uses: actions/upload-artifact@v3
with:
name: Pre-Built (${{ matrix.os }})
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ CPMAddPackage(

CPMFindPackage(
NAME ViennaRay
GIT_TAG 091fc29 # TODO: Create new tag and use VERSION
GIT_TAG db3d4e7 # TODO: Create new tag and use VERSION
GIT_REPOSITORY "https://github.com/ViennaTools/ViennaRay"
EXCLUDE_FROM_ALL ${VIENNAPS_BUILD_PYTHON})

Expand Down
15 changes: 10 additions & 5 deletions python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,23 @@ setup_binding(viennaps2d -DVIENNAPS_PYTHON_DIMENSION=2)
setup_binding(viennaps3d -DVIENNAPS_PYTHON_DIMENSION=3)

set(VIENNAPS_LIB_FOLDER "${VIENNAPS_LIBRARY_OUTPUT_DIR}/viennaps.libs")
set(VIENNAPS_USE_PYTHON_LIBS OFF)
set(VIENNAPS_USE_LIB_FOLDER OFF)

if(NOT VIENNARAY_DISABLE_COPY AND NOT VIENNARAY_SYSTEM_EMBREE)
set(VIENNAPS_USE_PYTHON_LIBS ON)
if(NOT VIENNARAY_SYSTEM_EMBREE)
set(VIENNAPS_USE_LIB_FOLDER ON)
setup_embree_env(${MODULE_NAME} "${VIENNAPS_LIB_FOLDER}")
endif()

if(NOT VIENNARAY_SYSTEM_TBB)
set(VIENNAPS_USE_LIB_FOLDER ON)
setup_tbb_env(${MODULE_NAME} "${VIENNAPS_LIB_FOLDER}")
endif()

if(WIN32 AND NOT VIENNALS_SYSTEM_VTK)
set(VIENNAPS_USE_PYTHON_LIBS ON)
set(VIENNAPS_USE_LIB_FOLDER ON)
setup_vtk_env(${MODULE_NAME} "${VIENNAPS_LIB_FOLDER}")
endif()

if(VIENNAPS_USE_PYTHON_LIBS)
if(VIENNAPS_USE_LIB_FOLDER)
install(DIRECTORY "${VIENNAPS_LIB_FOLDER}" DESTINATION .)
endif()

0 comments on commit 45aa536

Please sign in to comment.