mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-10 22:16:41 +00:00
PR daily builds of ifcopenshell and upload to conda (#2132)
* WIP PR for daily builds of ifcopenshell * fix indentation in yaml * fix branch name * test daily builds using minimum occt ==v7.5.3 * chore: WIP daily builds - add tests * add test script bat/sh. Continue work in PR * fix: add more packages to test requires * fix: remove space in minimum version requirement of numpy * use manually installed MacOSX SDK on github runner. Minor rewrite of dynamic/static zlib conditional for conda_build. * fix MacOSX SDK address and made it platform conditional * make tests pass * try to skip ids tests for common icopenshell builds (caused failure on windows tests probably due to special character in filepath) * add conditional upload and testing of all available platform versions on github actions * fix wrong path to source files * fix errors in tests * remove test files and skip tests * only do import of ifcopenshell as means of testing and rely on the successful completion of ci.yml as a triggering mechanism instead * make conditional switch between original implementation of zlib suffix and new depending on conda packaging or not * point to occt v0.7.6 * make conditional import of BRepAdaptor_HCompCurve * try removing libxml2 include path * minor changes * Test nix builds * Test nix builds using only a single python version (in order to limit cpu/memory usage) * remove run check * remove testing of nix builds * Revert "Test nix builds using only a single python version (in order to limit cpu/memory usage)" This reverts commit22a552a9ac. * Revert "ci-py-only test modification" This reverts part of commitaf1e832f* update occt version to 7.6.2 in daily builds * Revert "Test nix builds" This reverts commitaf1e832f81. * Complete setups for local and cloud environments. And start by adding IfcPerson as a test case for the REST api communication * Revert changing checkout version of MVD
This commit is contained in:
committed by
GitHub
parent
adb2883310
commit
dcad4146b6
+49
-19
@@ -452,30 +452,60 @@ if(NOT MINIMAL_BUILD AND HDF5_SUPPORT)
|
||||
|
||||
if (HDF5_LIBRARY_DIR)
|
||||
# result of the HDF5 ctest package
|
||||
|
||||
if (WIN32)
|
||||
set(zlib_post lib)
|
||||
set(lib_ext lib)
|
||||
else()
|
||||
set(lib_ext a)
|
||||
# Find zlib using cmake find_library. How should this be implemented?
|
||||
# FIND_LIBRARY(NAMES z libz libz_debug PATHS ... NO_DEFAULT_PATH)
|
||||
|
||||
|
||||
if ("$ENV{CONDA_BUILD}" STREQUAL "")
|
||||
# result of the HDF5 ctest package
|
||||
|
||||
if (WIN32)
|
||||
set(zlib_post lib)
|
||||
set(lib_ext lib)
|
||||
else()
|
||||
set(lib_ext a)
|
||||
endif()
|
||||
|
||||
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
|
||||
set(debug_postfix "_debug")
|
||||
endif()
|
||||
|
||||
SET(HDF5_LIBRARIES
|
||||
"${HDF5_LIBRARY_DIR}/libhdf5_cpp${debug_postfix}.${lib_ext}"
|
||||
"${HDF5_LIBRARY_DIR}/libhdf5${debug_postfix}.${lib_ext}"
|
||||
"${HDF5_LIBRARY_DIR}/libz${zlib_post}${debug_postfix}.${lib_ext}"
|
||||
"${HDF5_LIBRARY_DIR}/libsz${debug_postfix}.${lib_ext}"
|
||||
"${HDF5_LIBRARY_DIR}/libaec${debug_postfix}.${lib_ext}"
|
||||
)
|
||||
|
||||
ELSE()
|
||||
MESSAGE(STATUS "Packaging hdf5 and zlib for conda distribution")
|
||||
if (WIN32)
|
||||
# Windows
|
||||
set(zlib_post zlib)
|
||||
set(lib_ext lib)
|
||||
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
# macOS
|
||||
set(zlib_post libz)
|
||||
set(lib_ext dylib)
|
||||
else()
|
||||
# linux
|
||||
set(zlib_post libz)
|
||||
set(lib_ext so)
|
||||
endif()
|
||||
|
||||
SET(HDF5_LIBRARIES
|
||||
"${HDF5_LIBRARY_DIR}/libhdf5_cpp.${lib_ext}"
|
||||
"${HDF5_LIBRARY_DIR}/libhdf5.${lib_ext}"
|
||||
"${HDF5_LIBRARY_DIR}/${zlib_post}.${lib_ext}"
|
||||
)
|
||||
endif()
|
||||
|
||||
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
|
||||
set(debug_postfix "_debug")
|
||||
endif()
|
||||
|
||||
SET(HDF5_LIBRARIES
|
||||
"${HDF5_LIBRARY_DIR}/libhdf5_cpp${debug_postfix}.${lib_ext}"
|
||||
"${HDF5_LIBRARY_DIR}/libhdf5${debug_postfix}.${lib_ext}"
|
||||
"${HDF5_LIBRARY_DIR}/libz${zlib_post}${debug_postfix}.${lib_ext}"
|
||||
"${HDF5_LIBRARY_DIR}/libsz${debug_postfix}.${lib_ext}"
|
||||
"${HDF5_LIBRARY_DIR}/libaec${debug_postfix}.${lib_ext}"
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
if (NOT HDF5_LIBRARIES)
|
||||
# debian default
|
||||
|
||||
|
||||
SET(HDF5_LIBRARIES
|
||||
/usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5_cpp.so
|
||||
/usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5.so
|
||||
|
||||
Reference in New Issue
Block a user