From b862f633dbd5b0dee16991ee79236a77692e0c42 Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Tue, 30 Apr 2019 13:24:28 +0200 Subject: [PATCH] Fix voxel library in nix build script --- nix/build-all.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nix/build-all.py b/nix/build-all.py index 19a1886b02..c47830922c 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -321,6 +321,7 @@ def git_clone(clone_url, target_dir, revision=None): logger.info("directory '%s' exists, skipping cloning" % (target_dir,)) if revision != None: run([git, "checkout", revision], cwd=target_dir) + run([git, "pull"], cwd=target_dir) def build_dependency(name, mode, build_tool_args, download_url, download_name, download_tool=download_tool_default, revision=None, patch=None, additional_files={}, no_append_name=False): """Handles building of dependencies with different tools (which are @@ -674,7 +675,7 @@ if "voxel" in targets: "voxel", "cmake", build_tool_args=[ - "-IFCSUPPORT=Off", + "-DIFC_SUPPORT=Off", "-DOCC_INCLUDE_DIR=" +occ_include_dir, "-DOCC_LIBRARY_DIR=" +occ_library_dir, "-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/voxel".format(**locals()), @@ -683,7 +684,7 @@ if "voxel" in targets: download_url="https://github.com/opensourceBIM/voxel.git", download_name="voxel", download_tool=download_tool_git, - revision=master + revision="master" ) cecho("Building IfcOpenShell:", GREEN)