Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-25 09:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v0.6.0' into v0.7.0

Browse Source
This commit is contained in:
Thomas Krijnen
2021-07-10 21:21:22 +02:00
parent 9776cd2c99 cf48661a35
commit 5db7f52e03
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+6
View File
@@ -22,12 +22,17 @@ addons:
- nlohmann-json3-dev - nlohmann-json3-dev
- opencollada-dev - opencollada-dev
- python3-all-dev - python3-all-dev
- python3-pip
- swig - swig
- libhdf5-dev - libhdf5-dev
before_script: before_script:
- if [ $TRAVIS_OS_NAME == "linux" ]; then ccache -z; fi - if [ $TRAVIS_OS_NAME == "linux" ]; then ccache -z; fi
install:
# for IDS
- python3 -m pip install xmlschema
script: script:
- pwd - pwd
- mkdir build && cd build - mkdir build && cd build
@@ -40,6 +45,7 @@ script:
-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \ -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
-DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \ -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
-DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \ -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
"-DSCHEMA_VERSIONS=2x3;4" \
-DGLTF_SUPPORT=On \ -DGLTF_SUPPORT=On \
-DJSON_INCLUDE_DIR=/usr/include \ -DJSON_INCLUDE_DIR=/usr/include \
-DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \ -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
cmake/CMakeLists.txt
+3 -1
View File
@@ -535,7 +535,9 @@ function(files_for_ifc_version IFC_VERSION RESULT_NAME)
) )
endfunction() endfunction()
set(SCHEMA_VERSIONS "2x3" "4" "4x1" "4x2" "4x3_rc1" "4x3_rc2" "4x3_rc3" "4x3_rc4") if(NOT SCHEMA_VERSIONS)
set(SCHEMA_VERSIONS "2x3" "4" "4x1" "4x2" "4x3_rc1" "4x3_rc2" "4x3_rc3" "4x3_rc4")
endif()
foreach(s ${SCHEMA_VERSIONS}) foreach(s ${SCHEMA_VERSIONS})
add_definitions(-DHAS_SCHEMA_${s}) add_definitions(-DHAS_SCHEMA_${s})