Merge remote-tracking branch 'origin/v0.8.0' into datamodel-v1.0

src/qtviewer/CMakeLists.txt

@@ -17,13 +17,19 @@
 #                                                                              #
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.3)
-
 message("Running CMakeLists.txt in /src/qtviewer")
 
 # Specify the Qt version and components to use
 set(QT_VERSION 6 CACHE STRING "Qt version")
-set(QT_COMPONENTS Core Gui OpenGL OpenGLWidgets Widgets CACHE STRING "Qt components")
+set(QT_COMPONENTS
+    Core
+    Gui
+    OpenGL
+    OpenGLWidgets
+    Widgets
+    CACHE STRING
+    "Qt components"
+)
 
 find_package(Qt${QT_VERSION} COMPONENTS ${QT_COMPONENTS} REQUIRED PATHS ${QT_DIR})
 
@@ -47,10 +53,7 @@ set(targetName "QtViewer")
 # Scan for .qrc files and add to build process
 set(CMAKE_AUTORCC ON)
 
-set(RESOURCE_FILES
-    resources/qt_resources.qrc
-    resources/qt_res.rc
-)
+set(RESOURCE_FILES resources/qt_resources.qrc resources/qt_res.rc)
 
 # The MACOSX_BUNDLE_ICON_FILE variable is added to the Info.plist
 # generated by CMake. This variable contains the .icns file name,
@@ -59,10 +62,10 @@ set(MACOSX_BUNDLE_ICON_FILE ifcosLogo.icns)
 
 # The following tells CMake where to find and install the file itself.
 set(app_icon_macos "resources/ifcosLogo.icns")
-set_source_files_properties(${app_icon_macos} PROPERTIES
-        MACOSX_PACKAGE_LOCATION "Resources")
+set_source_files_properties(${app_icon_macos} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 
-add_executable(${targetName}
+add_executable(
+    ${targetName}
     MessageLogger.h
     IfcViewerWidget.h
     IfcViewerWidget.cpp
@@ -75,14 +78,13 @@ add_executable(${targetName}
     ${app_icon_macos}
 )
 
-set_target_properties(${targetName} PROPERTIES
-    AUTOMOC On
-    WIN32_EXECUTABLE ON
-    MACOSX_BUNDLE ON
-    RESOURCE "${RESOURCE_FILES}"
+set_target_properties(
+    ${targetName}
+    PROPERTIES AUTOMOC On WIN32_EXECUTABLE ON MACOSX_BUNDLE ON RESOURCE "${RESOURCE_FILES}"
 )
 
-target_link_libraries(${targetName}
+target_link_libraries(
+    ${targetName}
     ${IFCOPENSHELL_LIBRARIES}
     ${OpenCASCADE_LIBRARIES}
     ${OPENSCENEGRAPH_LIBRARIES}
@@ -93,10 +95,9 @@ target_link_libraries(${targetName}
     Qt${QT_VERSION}::Widgets
 )
 
-target_include_directories(${targetName} PUBLIC
-    ${QT_DIR}/include
-    ${OPENSCENEGRAPH_INCLUDE_DIRS}
-)
+target_include_directories(${targetName} PUBLIC ${QT_DIR}/include ${OPENSCENEGRAPH_INCLUDE_DIRS})
 
 get_target_property(targetIncludeDirs ${targetName} INCLUDE_DIRECTORIES)
 message(STATUS "target_include_directories: ${targetIncludeDirs}")
+
+install(TARGETS ${targetName})

src/qtviewer/ParseIfcFile.cpp

@@ -1,4 +1,5 @@
 #include "ParseIfcFile.h"
+#include "../ifcgeom/hybrid_kernel.h"
 
 #include "MessageLogger.h"
 #include "osg/Array"
@@ -31,7 +32,7 @@ bool ParseIfcFile::Parse(
     settings.set("weld-vertices", false);
     settings.set("apply-default-materials", true);
 
-    IfcGeom::Iterator* it = new IfcGeom::Iterator(settings, &file);
+    IfcGeom::Iterator* it = new IfcGeom::Iterator(ifcopenshell::geometry::kernels::construct(&file, "opencascade", settings), settings, &file);
     if (!it->initialize()) {
         MessageLogger::log("Error: Iterator failed to initialize! Aborting.");
         delete it;