Conda build fixes (#4)

BlueQuartzSoftware · Aug 21, 2023 · 9577773 · 9577773
1 parent 49e1972
commit 9577773
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -84,10 +84,10 @@ endif()
 #------------------------------------------------------------------------------
 # Find the HDF5 Library
 #------------------------------------------------------------------------------
-if(SIMPL_EMBED_PYTHON) # -- HDF5 is located in a python virtual environment
+if(DREAM3D_ANACONDA) # -- HDF5 is located in a python virtual environment
   set(HDF5_USE_STATIC_LIBRARIES OFF)
   set(HDF5_FIND_COMPONENTS OFF)
-  find_package(HDF5 1.10.6 EXACT MODULE REQUIRED)
+  find_package(HDF5 MODULE REQUIRED)
   set(HDF5_C_TARGET_NAME hdf5::hdf5)
   target_compile_definitions(H5Support INTERFACE H5_BUILT_AS_DYNAMIC_LIB)
 else() # -- Normal build with HDF5 found using HDF5Config.cmake
@@ -116,7 +116,6 @@ endif()
 target_include_directories(H5Support INTERFACE ${HDF5_INCLUDE_DIR})
 target_link_libraries(H5Support INTERFACE ${HDF5_C_TARGET_NAME})
 
-
 #------------------------------------------------------------------------------
 # Find the Qt5 Library if needed
 #------------------------------------------------------------------------------

diff --git a/cmake/H5SupportConfig.cmake b/cmake/H5SupportConfig.cmake
@@ -16,7 +16,7 @@ if(@H5Support_INCLUDE_QT_API@)
 endif()
 
 include(CMakeFindDependencyMacro)
-find_dependency(HDF5 NAMES hdf5)
+find_dependency(HDF5 MODULE)
 
 include("${CMAKE_CURRENT_LIST_DIR}/H5SupportTargets.cmake")