From eb1a5497fa741c8a2af0e52a0a975cf8765361c0 Mon Sep 17 00:00:00 2001 From: Curve Date: Sun, 17 Mar 2024 22:51:04 +0100 Subject: [PATCH] fix(cmake/python): lib folder naming --- python/CMakeLists.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 0b365cc..8d1d509 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -66,18 +66,19 @@ endmacro() setup_binding(viennaps2d -DVIENNAPS_PYTHON_DIMENSION=2) setup_binding(viennaps3d -DVIENNAPS_PYTHON_DIMENSION=3) -set(VIENNARAY_HAS_LIBS OFF) +set(VIENNAPS_LIB_FOLDER "${VIENNAPS_LIBRARY_OUTPUT_DIR}/viennaps.libs") +set(VIENNAPS_USE_PYTHON_LIBS OFF) if(NOT VIENNARAY_DISABLE_COPY AND NOT VIENNARAY_SYSTEM_EMBREE) - set(VIENNARAY_HAS_LIBS ON) - setup_embree_env(${MODULE_NAME} ${VIENNAPS_LIBRARY_OUTPUT_DIR}/viennaps.libs) + set(VIENNAPS_USE_PYTHON_LIBS ON) + setup_embree_env(${MODULE_NAME} "${VIENNAPS_LIB_FOLDER}") endif() if(WIN32 AND NOT VIENNALS_SYSTEM_VTK) - set(VIENNARAY_HAS_LIBS ON) - setup_vtk_env(${MODULE_NAME} ${VIENNAPS_LIBRARY_OUTPUT_DIR}/viennaps.libs) + set(VIENNAPS_USE_PYTHON_LIBS ON) + setup_vtk_env(${MODULE_NAME} "${VIENNAPS_LIB_FOLDER}") endif() -if(VIENNARAY_HAS_LIBS) - install(DIRECTORY "${VIENNAPS_LIBRARY_OUTPUT_DIR}/viennaps.libs" DESTINATION .) +if(VIENNAPS_USE_PYTHON_LIBS) + install(DIRECTORY "${VIENNAPS_LIB_FOLDER}" DESTINATION .) endif()