From a800a9e7c721fef1193ab7d5a9e0ff4dd03ebbad Mon Sep 17 00:00:00 2001 From: johltn Date: Mon, 4 Mar 2019 12:47:28 +0100 Subject: [PATCH] FIx MVD module --- src/ifcopenshell-python/ifcopenshell/mvd/__init__.py | 5 ++--- src/ifcwrap/CMakeLists.txt | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ifcopenshell-python/ifcopenshell/mvd/__init__.py b/src/ifcopenshell-python/ifcopenshell/mvd/__init__.py index f5505e7d41..b7bdebae67 100644 --- a/src/ifcopenshell-python/ifcopenshell/mvd/__init__.py +++ b/src/ifcopenshell-python/ifcopenshell/mvd/__init__.py @@ -1,10 +1,8 @@ import sys -import mvdxml_expression +from . import mvdxml_expression from xml.dom.minidom import parse, Element -import sparql - class rule(object): """ A class for representing an mvdXML EntityRule or AttributeRule @@ -183,6 +181,7 @@ class concept_root(object): if __name__ == "__main__": if len(sys.argv) == 3: + from . import sparql ttlfn, mvdfn = sys.argv[1:] sparql.derive_prefix(ttlfn) ttlfn = sparql.infer_subtypes(ttlfn) diff --git a/src/ifcwrap/CMakeLists.txt b/src/ifcwrap/CMakeLists.txt index 2401b8d43e..cec3302f6a 100644 --- a/src/ifcwrap/CMakeLists.txt +++ b/src/ifcwrap/CMakeLists.txt @@ -94,6 +94,11 @@ IF(PYTHONINTERP_FOUND AND NOT "${PYTHON_EXECUTABLE}" STREQUAL "") "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/geom/main.py" "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/geom/occ_utils.py" DESTINATION "${python_package_dir}/ifcopenshell/geom") + INSTALL(FILES + "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/mvd/__init__.py" + "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/mvd/sparql.py" + "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/mvd/mvdxml_expression.py" + DESTINATION "${python_package_dir}/ifcopenshell/mvd") INSTALL(TARGETS _ifcopenshell_wrapper DESTINATION "${python_package_dir}/ifcopenshell") ENDIF() ELSE()