diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 001417cd7a..7bc12b9f3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,6 +55,11 @@ jobs: - name: Install C++ dependencies run: | sudo apt update + # `occt-misc` is only needed for 22.04, since it has cmake configs. + # In 24.04+, the needed files were moved `libocct-foundation-dev` and `occt-misc` can be removed. + # Other libs in `OCCT_CMAKE_DEPS` are needed only for cmake config to work properly, they're not used directly. + OCCT_CMAKE_DEPS="occt-misc libocct-draw-dev tcl-dev tk-dev libxi-dev" + sudo apt-get install --no-install-recommends \ git cmake gcc g++ \ libboost-date-time-dev \ @@ -67,6 +72,7 @@ jobs: libpcre3-dev libxml2-dev \ libtbb-dev nlohmann-json3-dev \ libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \ + ${OCCT_CMAKE_DEPS} \ libhdf5-dev libcgal-dev libeigen3-dev - name: ccache @@ -209,8 +215,8 @@ jobs: cmake .. -DCMAKE_BUILD_TYPE=Release cmake --build . ./IfcParseExamples "../IfcParseExamples_test.ifc" - # ./IfcOpenHouse - # ./IfcAdvancedHouse + ./IfcOpenHouse + ./IfcAdvancedHouse ./IfcAlignment ./IfcSimplifiedAlignment diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt index fdf5608328..9133b77b7c 100644 --- a/src/examples/CMakeLists.txt +++ b/src/examples/CMakeLists.txt @@ -55,8 +55,7 @@ if(SCHEMA_VERSIONS MATCHES "2x3") endif() install(TARGETS IfcParseExamples) - # TODO: enable after figuring out where to get get OCCT config for CI. - if(WITH_OPENCASCADE AND NOT STANDALONE_PROJECT) + if(WITH_OPENCASCADE) add_executable(IfcOpenHouse IfcOpenHouse.cpp) add_executable(IfcAdvancedHouse IfcAdvancedHouse.cpp) add_library(IfcHouseInterface INTERFACE)