Skip to content

Commit

Permalink
feat: install required dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Curve committed Mar 17, 2024
1 parent b25cda3 commit 996ebc4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ CPMAddPackage(

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

CPMFindPackage(
Expand Down
14 changes: 12 additions & 2 deletions python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ add_custom_target(${PROJECT_NAME} ALL)
# --------------------------------------------------------------------------------------------------------

set(CMAKE_MACOSX_RPATH ON)

list(APPEND CMAKE_INSTALL_RPATH "$ORIGIN")
list(APPEND CMAKE_INSTALL_RPATH "$ORIGIN/../vtkmodules")

# --------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -47,6 +49,10 @@ set(VIENNAPS_PYTHON_MODULE_NAME_2D "_${VIENNAPS_PYTHON_MODULE_NAME}2d")
pybind11_add_module("${VIENNAPS_PYTHON_MODULE_NAME_2D}" "pyWrap.cpp")
add_dependencies(${PROJECT_NAME} ${VIENNAPS_PYTHON_MODULE_NAME_2D})

if(NOT VIENNARAY_DISABLE_COPY AND NOT VIENNARAY_SYSTEM_EMBREE)
setup_embree_env(${VIENNAPS_PYTHON_MODULE_NAME_2D} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
endif()

target_link_libraries(${VIENNAPS_PYTHON_MODULE_NAME_2D} PUBLIC ViennaPS)
target_compile_definitions(
${VIENNAPS_PYTHON_MODULE_NAME_2D}
Expand All @@ -65,6 +71,10 @@ set(VIENNAPS_PYTHON_MODULE_NAME_3D "_${VIENNAPS_PYTHON_MODULE_NAME}3d")
pybind11_add_module("${VIENNAPS_PYTHON_MODULE_NAME_3D}" "pyWrap.cpp")
add_dependencies(${PROJECT_NAME} ${VIENNAPS_PYTHON_MODULE_NAME_3D})

if(NOT VIENNARAY_DISABLE_COPY AND NOT VIENNARAY_SYSTEM_EMBREE)
setup_embree_env(${VIENNAPS_PYTHON_MODULE_NAME_3D} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
endif()

target_link_libraries(${VIENNAPS_PYTHON_MODULE_NAME_3D} PUBLIC ViennaPS)
target_compile_definitions(
${VIENNAPS_PYTHON_MODULE_NAME_3D}
Expand All @@ -78,7 +88,7 @@ configure_file(__init__.py.in ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/__init__.py)
# --------------------------------------------------------------------------------------------------------

install(TARGETS ${VIENNAPS_PYTHON_MODULE_NAME_2D} LIBRARY DESTINATION viennaps2d)
install(FILES "${VIENNAPS_LIBRARY_OUTPUT_DIR}/viennaps2d/__init__.py" DESTINATION viennaps2d)
install(DIRECTORY "${VIENNAPS_LIBRARY_OUTPUT_DIR}/viennaps2d" DESTINATION viennaps2d)

install(TARGETS ${VIENNAPS_PYTHON_MODULE_NAME_3D} LIBRARY DESTINATION viennaps3d)
install(FILES "${VIENNAPS_LIBRARY_OUTPUT_DIR}/viennaps3d/__init__.py" DESTINATION viennaps3d)
install(DIRECTORY "${VIENNAPS_LIBRARY_OUTPUT_DIR}/viennaps3d" DESTINATION viennaps3d)

0 comments on commit 996ebc4

Please sign in to comment.