Skip to content

Commit 13d70b7

Browse files
Apply tip of ecoezen
1 parent f032117 commit 13d70b7

File tree

5 files changed

+124
-521
lines changed

5 files changed

+124
-521
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
sources:
2-
"0.8.2.cci.20250407":
2+
"0.8.3.cci.20250609":
33
url: "https://github.com/IfcOpenShell/IfcOpenShell/archive/refs/tags/bonsai-0.8.3-alpha2506091850.tar.gz"
44
sha256: "a8e47eda928c580e1bb741cf324b3909ea8e15926e86aff1217098201acbf90a"
55
patches:
6-
"0.8.2.cci.20250407":
6+
"0.8.3.cci.20250609":
77
- patch_file: "patches/patchRootCMakeLists.patch"
88
patch_description: "Have options moved after project()"
9-
patch_type: "conan"
9+
patch_type: "conan"

recipes/ifcopenshell/all/conanfile.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ class IfcopenshellConan(ConanFile):
4242
"with_hdf5": True,
4343
}
4444
# Limit the default set of schemas to the basic ones and the latest to limit the size of the build.
45-
default_options.update({f"schema_{schema}": schema in ["4x3_add2"] for schema in IFC_SCHEMAS})
45+
default_options.update({f"schema_{schema}": schema in ["2x3", "4", "4x3_add2"] for schema in IFC_SCHEMAS})
46+
implements = ["auto_shared_fpic"]
4647

4748
@property
4849
def _selected_ifc_schemas(self):
@@ -124,9 +125,13 @@ def libdir(dep):
124125
if self.options.get_safe("with_hdf5"):
125126
tc.variables["HDF5_INCLUDE_DIR"] = includedir("hdf5")
126127
tc.variables["HDF5_LIBRARY_DIR"] = libdir("hdf5")
128+
129+
if self.settings.compiler == "msvc":
130+
existing_flags = tc.variables.get("CMAKE_CXX_FLAGS", "")
131+
tc.variables["CMAKE_CXX_FLAGS"] = existing_flags + " /permissive- /EHsc"
132+
127133
tc.generate()
128134

129-
tc.generate()
130135

131136
deps = CMakeDeps(self)
132137
deps.generate()
@@ -222,8 +227,8 @@ def _add_component(name, requires=None):
222227
_add_component(component_name)
223228
self.cpp_info.components["Serializers"].requires.append(component_name)
224229

225-
geometry_serializer = _add_component("geometry_serializer")
230+
geometry_serializer = _add_component("geometry_serializer", ["IfcParse", "IfcGeom", "opencascade::occt_tktopalgo", "opencascade::occt_tkbrep"])
226231
for schema in self._selected_ifc_schemas:
227232
component_name = f"geometry_serializer_ifc{schema}"
228-
_add_component(component_name, requires=["opencascade::occt_tkbrep"])
233+
_add_component(component_name, requires=["opencascade::occt_tkmesh", "opencascade::occt_tkxmesh", "opencascade::occt_tkmeshvs", "opencascade::occt_tktopalgo", "opencascade::occt_tkbrep", "opencascade::occt_tkgeomalgo"])
229234
geometry_serializer.requires.append(component_name)

recipes/ifcopenshell/all/test_package/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ add_executable(${PROJECT_NAME} test_package.cpp)
77
target_link_libraries(${PROJECT_NAME} PRIVATE
88
IfcParse
99
IfcGeom
10+
geometry_serializer
1011
)

0 commit comments

Comments
 (0)