Rename to helpers

This commit is contained in:
Thomas Krijnen
2026-07-03 11:18:57 +02:00
parent 5873b05b84
commit a54a8b80d3
11 changed files with 17 additions and 17 deletions
+2 -2
View File
@@ -708,11 +708,11 @@ if(BUILD_BONSAIVIEWER_TESTS)
endif() endif()
if(BUILD_BONSAIVIEWER) if(BUILD_BONSAIVIEWER)
# IfcUtil first — schema-agnostic helpers (Unit, Geolocation, # helpers first — schema-agnostic helpers (Unit, Geolocation,
# Placement) that IfcViewer's Federation links against. Adding here # Placement) that IfcViewer's Federation links against. Adding here
# before ifcviewer/ so the link target exists when IfcViewer's # before ifcviewer/ so the link target exists when IfcViewer's
# CMakeLists runs. # CMakeLists runs.
add_subdirectory(../src/ifcutil ifcutil) add_subdirectory(../src/helpers helpers)
# IfcViewer is the unified scene + render lib since the wgpu/ifcviewer # IfcViewer is the unified scene + render lib since the wgpu/ifcviewer
# merge — wgpu-native is fetched inside its CMakeLists.txt. # merge — wgpu-native is fetched inside its CMakeLists.txt.
add_subdirectory(../src/ifcviewer ifcviewer) add_subdirectory(../src/ifcviewer ifcviewer)
@@ -33,7 +33,7 @@ Stack
the event loop driving render scheduling, and the timer/elapsed the event loop driving render scheduling, and the timer/elapsed
primitives used in instrumentation. primitives used in instrumentation.
* **IfcOpenShell C++ libs** (IfcParse / IfcGeom) for IFC parsing and * **IfcOpenShell C++ libs** (IfcParse / IfcGeom) for IFC parsing and
geometry generation, plus **IfcUtil** for the schema-agnostic geometry generation, plus **helpers** for the schema-agnostic
helpers (``Unit``, ``Geolocation``, ``Placement``). helpers (``Unit``, ``Geolocation``, ``Placement``).
* **Eigen3** for 4×4 matrices and small linear algebra. * **Eigen3** for 4×4 matrices and small linear algebra.
* **meshoptimizer** at sidecar-build time only — decimates each * **meshoptimizer** at sidecar-build time only — decimates each
@@ -33,28 +33,28 @@ message("Running CMakeLists.txt in /src/ifcutil")
find_package(Eigen3 REQUIRED) find_package(Eigen3 REQUIRED)
file(GLOB IFCUTIL_CPP_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) file(GLOB HELPER_CPP_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
file(GLOB IFCUTIL_H_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h) file(GLOB HELPER_H_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
add_library(IfcUtil STATIC ${IFCUTIL_CPP_FILES} ${IFCUTIL_H_FILES}) add_library(helpers STATIC ${HELPER_CPP_FILES} ${HELPER_H_FILES})
set_target_properties(IfcUtil PROPERTIES set_target_properties(helpers PROPERTIES
VERSION "${PROJECT_VERSION}" VERSION "${PROJECT_VERSION}"
SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}" SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
) )
# PUBLIC: callers (IfcViewer, test_federation, future tools) get # PUBLIC: callers (IfcViewer, test_federation, future tools) get
# `#include "Unit.h"` etc. via this directory automatically, no # `#include "Unit.h"` etc. via this directory automatically, no
# `#include "../ifcutil/Unit.h"` ugliness at call sites. # `#include "../helpers/Unit.h"` ugliness at call sites.
target_include_directories(IfcUtil PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(helpers PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(IfcUtil PUBLIC target_link_libraries(helpers PUBLIC
IfcParse IfcParse
Eigen3::Eigen Eigen3::Eigen
) )
install(TARGETS IfcUtil EXPORT ${IFCOPENSHELL_EXPORT_TARGETS}) install(TARGETS helpers EXPORT ${IFCOPENSHELL_EXPORT_TARGETS})
install(FILES ${IFCUTIL_H_FILES} install(FILES ${HELPER_H_FILES}
DESTINATION ${INCLUDEDIR}/ifcutil DESTINATION ${INCLUDEDIR}/helpers
) )
+1 -1
View File
@@ -275,7 +275,7 @@ add_dependencies(IfcViewer ${kernel_libraries} ${mapping_libraries})
target_link_libraries(IfcViewer PUBLIC target_link_libraries(IfcViewer PUBLIC
IfcViewerCore IfcViewerCore
IfcUtil helpers
IfcGeom IfcGeom
IfcParse IfcParse
${OpenCASCADE_LIBRARIES} ${OpenCASCADE_LIBRARIES}
+3 -3
View File
@@ -158,11 +158,11 @@ target_link_libraries(test_federation PRIVATE
Qt${QT_VERSION}::Gui # Federation::HomeView uses QVector3D from QtGui Qt${QT_VERSION}::Gui # Federation::HomeView uses QVector3D from QtGui
Qt${QT_VERSION}::Test # QSignalSpy Qt${QT_VERSION}::Test # QSignalSpy
Eigen3::Eigen # Federation.h: composed matrices use Eigen Eigen3::Eigen # Federation.h: composed matrices use Eigen
# IfcUtil provides Unit::convert + Geolocation helpers # helpers provides Unit::convert + Geolocation helpers
# (helmertMetersFromParameters, getWcs, getMapUnit) + Placement # (helmertMetersFromParameters, getWcs, getMapUnit) + Placement
# (getAxis2Placement, called from Geolocation::getWcs). Linking the # (getAxis2Placement, called from Geolocation::getWcs). Linking the
# static lib avoids re-compiling those .cpp files here and pulls # static lib avoids re-compiling those .cpp files here and pulls
# the IfcUtil include dir + IfcParse transitively. # the src/helpers include dir + IfcParse transitively.
IfcUtil helpers
) )
catch_discover_tests(test_federation) catch_discover_tests(test_federation)