Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-21 14:23:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update nix build script to default GLTF_SUPPORT to ON

Browse Source
This commit is contained in:
Thomas Krijnen
2019-05-21 13:31:43 +02:00
parent 21981403c7
commit 703c69fdde
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/build-all.py
+12 -2
View File
@@ -188,7 +188,7 @@ cecho(""" - How many compiler processes may be run in parallel.
dependency_tree = { dependency_tree = {
'IfcParse': ('boost', 'libxml2'), 'IfcParse': ('boost', 'libxml2'),
'IfcGeom': ('IfcParse', 'occ'), 'IfcGeom': ('IfcParse', 'occ'),
'IfcConvert': ('IfcGeom', 'OpenCOLLADA'), 'IfcConvert': ('IfcGeom', 'OpenCOLLADA', 'json'),
'OpenCOLLADA': ('libxml2', 'pcre'), 'OpenCOLLADA': ('libxml2', 'pcre'),
'IfcGeomServer': ('IfcGeom',), 'IfcGeomServer': ('IfcGeom',),
'IfcOpenShell-Python': ('python', 'swig', 'IfcGeom'), 'IfcOpenShell-Python': ('python', 'swig', 'IfcGeom'),
@@ -198,7 +198,8 @@ dependency_tree = {
'python': (), 'python': (),
'swig': (), 'swig': (),
'occ': (), 'occ': (),
'pcre': () 'pcre': (),
'json': ()
} }
def v(dep): def v(dep):
@@ -486,6 +487,13 @@ for FL in ["C", "CXX"]:
# declare ${FL}FLAGS_MINIMAL="`$DEPS_DIR/install/cmake-$CMAKE_VERSION/bin/cmake . 2>&1 >/dev/null` ${!FLM}" # declare ${FL}FLAGS_MINIMAL="`$DEPS_DIR/install/cmake-$CMAKE_VERSION/bin/cmake . 2>&1 >/dev/null` ${!FLM}"
shutil.rmtree(CMAKE_FLAG_EXTRACT_DIR) shutil.rmtree(CMAKE_FLAG_EXTRACT_DIR)
if "json" in targets:
json_url = "https://github.com/nlohmann/json/releases/download/v3.6.1/json.hpp"
json_install_path = "{DEPS_DIR}/install/json/nlohmann/json.hpp".format(**locals())
if not os.path.exists(json_install_path):
os.makedirs(os.path.dirname(json_install_path))
urllib.urlretrieve(json_url, json_install_path)
if "pcre" in targets: if "pcre" in targets:
build_dependency( build_dependency(
name="pcre-{PCRE_VERSION}".format(**locals()), name="pcre-{PCRE_VERSION}".format(**locals()),
@@ -657,6 +665,8 @@ cmake_args=[
"-DBUILD_CONVERT=" +OFF_ON["IfcConvert" in targets], "-DBUILD_CONVERT=" +OFF_ON["IfcConvert" in targets],
"-DCMAKE_INSTALL_PREFIX=" "{DEPS_DIR}/install/ifcopenshell".format(**locals()), "-DCMAKE_INSTALL_PREFIX=" "{DEPS_DIR}/install/ifcopenshell".format(**locals()),
"-DBOOST_ROOT=" "{DEPS_DIR}/install/boost-{BOOST_VERSION}".format(**locals()), "-DBOOST_ROOT=" "{DEPS_DIR}/install/boost-{BOOST_VERSION}".format(**locals()),
"-DGLTF_SUPPORT=" "ON",
"-DJSON_INCLUDE_DIR=" "{DEPS_DIR}/install/json".format(**locals())
] ]
if "occ" in targets and USE_OCCT: if "occ" in targets and USE_OCCT: