build-all.py - avoid building 3d viewer for OCCT

build-all.py - use find_package for CGAL
cmake - use find_package if explicit paths are not provided
2026-08-06 16:01:36 +00:00 · 2025-09-18 17:21:44 +05:00 · 2025-09-18 17:21:44 +05:00 · 2025-09-18 17:21:40 +05:00 · 2025-09-18 17:21:38 +05:00 · 2025-09-18 17:21:34 +05:00
3 changed files with 92 additions and 73 deletions
@@ -229,8 +229,16 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 endmacro()

 if(WITH_CGAL)
-    if(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT EXISTS "${CGAL_INCLUDE_DIR}")
-        message(FATAL_ERROR "CGAL_INCLUDE_DIR ('${CGAL_INCLUDE_DIR}') is not provided or doesn't exist.")
+    if(NOT CGAL_INCLUDE_DIR)
+        find_package(CGAL REQUIRED)
+        if(NOT CGAL_DIR)
+            message(
+                FATAL_ERROR
+                "CGAL_SUPPORT enabled, but CGAL_INCLUDE_DIR wasn't provided and CGAL package couldn't be found."
+            )
+        endif()
+        message(STATUS "CGAL: found config at '${CGAL_DIR}'.")
+        link_libraries(CGAL::CGAL)
    endif()

    add_definitions(-DIFOPSH_WITH_CGAL)
@@ -251,15 +259,26 @@ endif()

 if(GLTF_SUPPORT OR CITYJSON_SUPPORT)
    UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
-    clear_wasm_sysroot()
-    find_path(json_header_path "nlohmann/json.hpp" HINTS ${JSON_INCLUDE_DIR})
-    restore_wasm_sysroot()
-    set(JSON_INCLUDE_DIR ${json_header_path})
-
-    if(json_header_path)
-        message(STATUS "JSON for Modern C++ header file found in ${JSON_INCLUDE_DIR}")
-    else()
-        message(FATAL_ERROR "Unable to find JSON for Modern C++ header file, aborting")
+    if(NOT JSON_INCLUDE_DIR)
+        find_package(nlohmann_json CONFIG)
+        if(nlohmann_json_DIR)
+            link_libraries(nlohmann_json::nlohmann_json)
+        else()
+            message(STATUS "Unable to find nlohmann_json package, trying to find it as a header-only library.")
+        endif()
+    endif()
+    
+    if(NOT nlohmann_json_DIR)
+        clear_wasm_sysroot()
+        find_path(json_header_path "nlohmann/json.hpp" HINTS ${JSON_INCLUDE_DIR})
+        restore_wasm_sysroot()
+        set(JSON_INCLUDE_DIR ${json_header_path})
+        
+        if(json_header_path)
+            message(STATUS "JSON for Modern C++ header file found in '${JSON_INCLUDE_DIR}'.")
+        else()
+            message(FATAL_ERROR "Unable to find JSON for Modern C++ header file / package, aborting")
+        endif()
    endif()

    add_definitions(-DWITH_GLTF)
@@ -429,37 +448,12 @@ if(BUILD_IFCGEOM)

    # Open CASCADE
    if(WITH_OPENCASCADE)
-
-    # Fallback for missing OCC_INCLUDE_DIR.
-    if(NOT OCC_INCLUDE_DIR)
-	clear_wasm_sysroot()
-        find_path(OCC_INCLUDE_DIR Standard_Version.hxx
-            PATHS
-                /usr/include/occt
-                /usr/include/oce
-                /usr/include/opencascade
-        )
-	restore_wasm_sysroot()
-
-        if(OCC_INCLUDE_DIR)
-            message(STATUS "Found Open CASCADE include files in: ${OCC_INCLUDE_DIR}")
-        endif()
-    else()
+    if(OCC_INCLUDE_DIR)
        set(OCC_INCLUDE_DIR ${OCC_INCLUDE_DIR} CACHE FILEPATH "Open CASCADE header files")
        message(STATUS "Looking for Open CASCADE include files in: ${OCC_INCLUDE_DIR}")
    endif()

-    if("${OCC_LIBRARY_DIR}" STREQUAL "")
-        find_library(OCC_LIBRARY TKernel
-            PATHS
-                /usr/lib
-        )
-
-        if(OCC_LIBRARY)
-            GET_FILENAME_COMPONENT(OCC_LIBRARY_DIR ${OCC_LIBRARY} PATH)
-            message(STATUS "Found Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
-        endif()
-    else()
+    if(OCC_LIBRARY_DIR)
        set(OCC_LIBRARY_DIR ${OCC_LIBRARY_DIR} CACHE FILEPATH "Open CASCADE library files")
        message(STATUS "Looking for Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
    endif()
@@ -468,14 +462,15 @@ if(BUILD_IFCGEOM)
    if(OCC_INCLUDE_DIR AND OCC_LIBRARY_DIR)
        message(
            STATUS
-            "Using provided OCCT_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') "
+            "Using provided OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') "
            "and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}')."
        )
    elseif(NOT OCC_INCLUDE_DIR AND NOT OCC_LIBRARY_DIR)
+        # OCE is not supported for find_package, because it's using a different name (`oce`)
+        # and also has an odd directory structure (install/lib/oce-0.18/*.cmake).
        find_package(OpenCASCADE CONFIG REQUIRED)
-        get_target_property(OCC_INCLUDE_DIR TKernel INTERFACE_INCLUDE_DIRECTORIES)
-        get_target_property(TKERNEL_LIB_PATH TKernel LOCATION)
-        get_filename_component(OCC_LIBRARY_DIR "${TKERNEL_LIB_PATH}" DIRECTORY)
+        set(OCC_INCLUDE_DIR ${OpenCASCADE_INCLUDE_DIR})
+        set(OCC_LIBRARY_DIR ${OpenCASCADE_LIBRARY_DIR})
        message(
            STATUS
            "Found Open CASCADE package at '${OpenCASCADE_DIR}', "
@@ -487,7 +482,9 @@ if(BUILD_IFCGEOM)
            FATAL_ERROR
            "Couldn't find Open CASCADE installation. "
            "Either both OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}') "
-            "must be specified or OpenCASCADE package should be discoverable."
+            "must be specified or OpenCASCADE package should be discoverable. "
+            "If you're using OCE, then providing a package is not available "
+            "and you need to provide OCE_INCLUDE_DIR and OCE_LIBRARY_DIR directly."
        )
    endif()

@@ -885,7 +882,9 @@ endif(MSVC)
 # Ensure other dependencies are provided.
 if(NOT EXISTS "${EIGEN_DIR}")
    find_package(Eigen3 CONFIG)
-    if(NOT Eigen3_DIR)
+    if(Eigen3_DIR)
+        message(STATUS "Eigen3: found config at '${Eigen3_DIR}'.")
+    else()
        message(
            FATAL_ERROR
            "EIGEN_DIR is not provided or provided folder doesn't exist (current value: '${EIGEN_DIR}'). "
@@ -1075,7 +1074,11 @@ else()
 endif()

 if(BUILD_IFCGEOM)
-    if(WITH_CGAL)
+    # CGAL::CGAL target already has dependencies resolved.
+    if(WITH_CGAL AND CGAL_DIR)
+        set(CGAL_LIBRARIES CGAL::CGAL)
+        message(STATUS "Using found CGAL package at '${CGAL_DIR}'")
+    elseif(WITH_CGAL AND NOT CGAL_DIR)
 	clear_wasm_sysroot()
        find_library(libGMP NAMES gmp mpir PATHS ${GMP_LIBRARY_DIR} NO_DEFAULT_PATH)
        find_library(libMPFR NAMES mpfr PATHS ${MPFR_LIBRARY_DIR} NO_DEFAULT_PATH)
@@ -43,9 +43,12 @@ Used environment variables:
    - ``BUILD_CFG`` - build configuration, 'RelWithDebInfo' by default.
    - ``USE_CURRENT_PYTHON_VERSION`` - use current python config instead of compile from source
    - ``IFCOS_NUM_BUILD_PROCS`` - number of concurrent processes defaults to available cores + 1
-    - ``NO_CLEAN`` - do not clean build directories but continue working on current build (installed dependencies are never cleared)
-    - ``IFCOS_SCHEMAS`` - schemas to be built; defaults to cmake default (IFC2X3; IFC4; IFC4X3_ADD2) - to be supplied as 2x3;4
-
+    - ``NO_CLEAN`` - do not clean `ifcopenshell` build directories but continue working on current build
+    (installed dependencies are never cleared).
+    By default option is disabled, to enable pass any value from `1`, `on`, `true`.
+    - ``IFCOS_SCHEMAS`` - schemas to be built; defaults to cmake default (IFC2X3; IFC4; IFC4X3_ADD2) - to be supplied as `2x3;4`
+    - ``USE_OCCT`` - whether to use official Open CASCADE instead of Community Edition
+    (`true` by default, any other value is considered `false`)

 # This script builds IfcOpenShell and its dependencies                        #
 #                                                                             #
@@ -128,10 +131,11 @@ USE_CURRENT_PYTHON_VERSION = os.getenv("USE_CURRENT_PYTHON_VERSION")
 ADD_COMMIT_SHA = os.getenv("ADD_COMMIT_SHA")

 PYTHON_VERSIONS = ["3.9.11", "3.10.3", "3.11.8", "3.12.1", "3.13.0"]
-JSON_VERSION = "v3.6.1"
+JSON_VERSION = "3.10.0"
 OCE_VERSION = "0.18.3"
 OCCT_VERSION = "7.8.1"
 BOOST_VERSION = "1.86.0"
+EIGEN_VERSION = "3.3.9"
 PCRE_VERSION = "8.41"
 PCRE2_VERSION = "10.32"
 LIBXML2_VERSION = "2.13.8"
@@ -739,16 +743,29 @@ if "hdf5" in targets:


 if "json" in targets:
-    json_url = f"https://github.com/nlohmann/json/releases/download/{JSON_VERSION}/json.hpp"
-    json_install_path = f"{DEPS_DIR}/install/json/nlohmann/json.hpp"
-    if not os.path.exists(os.path.dirname(json_install_path)):
-        os.makedirs(os.path.dirname(json_install_path))
-    if not os.path.exists(json_install_path):
-        urlretrieve(json_url, json_install_path)
+    dependency_name = f"json-{JSON_VERSION}"
+    build_dependency(
+        name=dependency_name,
+        mode="cmake",
+        build_tool_args=[
+            f"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/{dependency_name}",
+            "-DJSON_BuildTests=OFF",
+        ],
+        download_url=f"https://github.com/nlohmann/json/releases/download/v{JSON_VERSION}",
+        download_name="json.tar.xz",
+    )

 if "eigen" in targets:
-    git_clone_or_pull_repository(
-        "https://gitlab.com/libeigen/eigen.git", f"{DEPS_DIR}/install/eigen-3.3.9", revision="3.3.9"
+    dependency_name = f"eigen-install-{EIGEN_VERSION}"
+    build_dependency(
+        name=f"{dependency_name}",
+        mode="cmake",
+        # We add '-install-' in the middle, so it won't be confused with git repo we used previously.
+        build_tool_args=[
+            f"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/{dependency_name}",
+        ],
+        download_url=f"https://gitlab.com/libeigen/eigen/-/archive/{EIGEN_VERSION}/",
+        download_name=f"eigen-{EIGEN_VERSION}.tar.gz",
    )

 if "pcre" in targets:
@@ -820,6 +837,10 @@ if USE_OCCT and "occ" in targets:
            f"-DBUILD_RELEASE_DISABLE_EXCEPTIONS=Off",
            # Disable xlib explicitly, as it tries to use it on Desktop Ubuntu, adding unnecessary dependency.
            f"-DUSE_XLIB=OFF",
+            # Avoid building 3D Viewer.
+            f"-DUSE_FREETYPE=OFF",
+            f"-DUSE_OPENGL=OFF",
+            f"-DUSE_GLES2=OFF",
            f"-D3RDPARTY_FREETYPE_DIR={DEPS_DIR}/install/freetype",
        ],
        download_url="https://github.com/Open-Cascade-SAS/OCCT",
@@ -1099,16 +1120,17 @@ cmake_args = [
    "-DUSE_MMAP=OFF",
    "-DBUILD_EXAMPLES=OFF",
    "-DBUILD_SHARED_LIBS=" + OFF_ON[not BUILD_STATIC],
-    f"-DBOOST_ROOT={DEPS_DIR}/install/boost-{BOOST_VERSION}",
    "-DGLTF_SUPPORT=ON",
-    f"-DJSON_INCLUDE_DIR={DEPS_DIR}/install/json",
-    f"-DEIGEN_DIR={DEPS_DIR}/install/eigen-3.3.9",
    "-DBoost_NO_BOOST_CMAKE=On",
    "-DADD_COMMIT_SHA=" + ("On" if ADD_COMMIT_SHA else "Off"),
    "-DVERSION_OVERRIDE=" + ("On" if ADD_COMMIT_SHA else "Off"),
 ]
 """Default CMake args to use for all CMake configs."""
-cmake_args_prefix_path: list[str] = []
+cmake_args_prefix_path: list[str] = [
+    f"{DEPS_DIR}/install/boost-{BOOST_VERSION}",
+    f"{DEPS_DIR}/install/eigen-install-{EIGEN_VERSION}",
+    f"{DEPS_DIR}/install/json-{JSON_VERSION}",
+]


 def get_cmake_args_prefix_path(additional_paths: Sequence[str] = ()) -> list[str]:
@@ -1128,22 +1150,15 @@ if schemas:
    cmake_args.append(f"-DSCHEMA_VERSIONS={schemas}")

 if "cgal" in targets:
-    cmake_args.extend(
-        [
-            f"-DCGAL_INCLUDE_DIR={DEPS_DIR}/install/cgal-{CGAL_VERSION}/include",
-            f"-DGMP_INCLUDE_DIR={DEPS_DIR}/install/gmp-{GMP_VERSION}/include",
-            f"-DGMP_LIBRARY_DIR={DEPS_DIR}/install/gmp-{GMP_VERSION}/lib",
-            f"-DMPFR_INCLUDE_DIR={DEPS_DIR}/install/mpfr-{MPFR_VERSION}/include",
-            f"-DMPFR_LIBRARY_DIR={DEPS_DIR}/install/mpfr-{MPFR_VERSION}/lib",
-        ]
-    )
+    cmake_args_prefix_path.append(f"{DEPS_DIR}/install/cgal-{CGAL_VERSION}")
+    cmake_args_prefix_path.append(f"{DEPS_DIR}/install/gmp-{GMP_VERSION}")
+    cmake_args_prefix_path.append(f"{DEPS_DIR}/install/mpfr-{MPFR_VERSION}")

 if "occ" in targets and USE_OCCT:
-    occ_include_dir = f"{DEPS_DIR}/install/occt-{OCCT_VERSION}/include/opencascade"
-    occ_library_dir = f"{DEPS_DIR}/install/occt-{OCCT_VERSION}/lib"
-    cmake_args.extend(["-DOCC_INCLUDE_DIR=" + occ_include_dir, "-DOCC_LIBRARY_DIR=" + occ_library_dir])
+    cmake_args_prefix_path.append(f"{DEPS_DIR}/install/occt-{OCCT_VERSION}")

 elif "occ" in targets:
+    # We don't support find_package for OCE.
    occ_include_dir = f"{DEPS_DIR}/install/oce-{OCE_VERSION}/include/oce"
    occ_library_dir = f"{DEPS_DIR}/install/oce-{OCE_VERSION}/lib"
    cmake_args.extend(["-DOCC_INCLUDE_DIR=" + occ_include_dir, "-DOCC_LIBRARY_DIR=" + occ_library_dir])
@@ -162,6 +162,7 @@ echo "Running CMake for %PROJECT_NAME%."

 set CMAKE_PREFIX_PATH=%HDF5_INSTALL_DIR%;%OPENCOLLADA_INSTALL_DIR%;%SWIG_INSTALL_DIR%
 set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%ROCKSDB_INSTALL_DIR%;%ZSTD_INSTALL_DIR%
+set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%BOOST_ROOT%

 IF NOT "%VS_TOOLSET_HOST%"=="" (
    cmake.exe %CMAKELISTS_DIR% -G %GENERATOR% -A %VS_PLATFORM% -T %VS_TOOLSET_HOST% ^
Author	SHA1	Message	Date
Andrej730	f2aeb94298	build-all.py - avoid building 3d viewer for OCCT	2025-09-18 17:21:44 +05:00
Andrej730	1025300acd	build-all.py - use find_package for CGAL	2025-09-18 17:21:44 +05:00
Andrej730	dec31a0258	cmake - use find_package if explicit paths are not provided	2025-09-18 17:21:40 +05:00
Andrej730	324c4fbc48	build-all.py - bump json version and use find_package	2025-09-18 17:21:38 +05:00
Andrej730	07923c22b6	cmake - support find_package for json	2025-09-18 17:21:34 +05:00
Andrej730	521ebcc3d3	build-all.py - use find_package for eigen3	2025-09-18 17:21:23 +05:00
Andrej730	3eb72deed7	build-all, run-cmake - pass BOOST_ROOT as cmake prefix path	2025-09-18 17:21:19 +05:00
Andrej730	f6d21af43c	build-all.py - use find_package of occt	2025-09-18 17:21:16 +05:00
Andrej730	0c2f522e89	cmake - use find_package for occ if variables are not provided cmake configs seems to be provided with the default installation, so `find_package` should do the job that `find_path` and `find_library` did previously.	2025-09-18 17:21:14 +05:00
Andrej730	4f01277580	build-all.py - document more env variables	2025-09-18 17:21:00 +05:00