fix: don't use non existent macros when system installation is used

ViennaTools · Apr 13, 2024 · 8f850b1 · 8f850b1
1 parent b0dd1a0
commit 8f850b1
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -71,6 +71,24 @@ target_include_directories(
   ${PROJECT_NAME} INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/viennaps>
                             $<INSTALL_INTERFACE:include/viennaps-${PROJECT_VERSION}>)
 
+# --------------------------------------------------------------------------------------------------------
+# Check whether or not dependencies are installed on the system
+# └ VTK requires C Language support (HDF5)
+# --------------------------------------------------------------------------------------------------------
+
+enable_language(C)
+
+find_package(ViennaRay QUIET)
+find_package(ViennaLS QUIET)
+
+set(VIENNAPS_SYSTEM_VIENNARAY
+    ${ViennaRay_FOUND}
+    CACHE INTERNAL "")
+
+set(VIENNAPS_SYSTEM_VIENNALS
+    ${ViennaLS_FOUND}
+    CACHE INTERNAL "")
+
 # --------------------------------------------------------------------------------------------------------
 # Setup Dependencies
 # --------------------------------------------------------------------------------------------------------

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -4,15 +4,21 @@ include("../cmake/bat.cmake")
 
 set(VIENNAPS_EXAMPLES_LIB $<1:${PROJECT_BINARY_DIR}/example-libs>)
 
-if(WIN32 AND NOT VIENNARAY_SYSTEM_EMBREE)
+if(WIN32
+   AND NOT VIENNAPS_SYSTEM_VIENNARAY
+   AND NOT VIENNARAY_SYSTEM_EMBREE)
   setup_embree_env(ViennaPS_Examples ${VIENNAPS_EXAMPLES_LIB})
 endif()
 
-if(WIN32 AND NOT VIENNARAY_SYSTEM_TBB)
+if(WIN32
+   AND NOT VIENNAPS_SYSTEM_VIENNARAY
+   AND NOT VIENNARAY_SYSTEM_TBB)
   setup_tbb_env(ViennaPS_Examples ${VIENNAPS_EXAMPLES_LIB})
 endif()
 
-if(WIN32 AND NOT VIENNALS_SYSTEM_VTK)
+if(WIN32
+   AND NOT VIENNAPS_SYSTEM_VIENNALS
+   AND NOT VIENNALS_SYSTEM_VTK)
   setup_vtk_env(ViennaPS_Examples ${VIENNAPS_EXAMPLES_LIB})
 endif()
 

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -77,17 +77,19 @@ setup_binding(viennaps3d -DVIENNAPS_PYTHON_DIMENSION=3)
 set(VIENNAPS_LIB_FOLDER "${VIENNAPS_LIBRARY_OUTPUT_DIR}/viennaps.libs")
 set(VIENNAPS_USE_LIB_FOLDER OFF)
 
-if(NOT VIENNARAY_SYSTEM_EMBREE)
+if(NOT VIENNAPS_SYSTEM_VIENNARAY AND NOT VIENNARAY_SYSTEM_EMBREE)
   set(VIENNAPS_USE_LIB_FOLDER ON)
   setup_embree_env(${MODULE_NAME} "${VIENNAPS_LIB_FOLDER}")
 endif()
 
-if(NOT VIENNARAY_SYSTEM_TBB)
+if(NOT VIENNAPS_SYSTEM_VIENNARAY AND NOT VIENNARAY_SYSTEM_TBB)
   set(VIENNAPS_USE_LIB_FOLDER ON)
   setup_tbb_env(${MODULE_NAME} "${VIENNAPS_LIB_FOLDER}")
 endif()
 
-if((APPLE OR WIN32) AND NOT VIENNALS_SYSTEM_VTK)
+if(NOT VIENNAPS_SYSTEM_VIENNALS
+   AND (APPLE OR WIN32)
+   AND NOT VIENNALS_SYSTEM_VTK)
   set(VIENNAPS_USE_LIB_FOLDER ON)
   setup_vtk_env(${MODULE_NAME} "${VIENNAPS_LIB_FOLDER}")
 endif()

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -2,15 +2,21 @@ add_custom_target(ViennaPS_Tests ALL)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/tests-bin>)
 
-if(WIN32 AND NOT VIENNARAY_SYSTEM_EMBREE)
+if(WIN32
+   AND NOT VIENNAPS_SYSTEM_VIENNARAY
+   AND NOT VIENNARAY_SYSTEM_EMBREE)
   setup_embree_env(ViennaPS_Tests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 endif()
 
-if(WIN32 AND NOT VIENNARAY_SYSTEM_TBB)
+if(WIN32
+   AND NOT VIENNAPS_SYSTEM_VIENNARAY
+   AND NOT VIENNARAY_SYSTEM_TBB)
   setup_tbb_env(ViennaPS_Tests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 endif()
 
-if(WIN32 AND NOT VIENNALS_SYSTEM_VTK)
+if(WIN32
+   AND NOT VIENNAPS_SYSTEM_VIENNALS
+   AND NOT VIENNALS_SYSTEM_VTK)
   setup_vtk_env(ViennaPS_Tests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 endif()