Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-12 14:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes for gcc

Browse Source
This commit is contained in:
aothms
2020-04-03 14:56:46 +00:00
parent 9b391d3d47
commit bba7295edf
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/build-all.py
+3 -1
View File
@@ -748,7 +748,8 @@ if "cgal" in targets:
"-DGMP_INCLUDE_DIR=" "{DEPS_DIR}/install/gmp-{GMP_VERSION}/include".format(**locals()), "-DGMP_INCLUDE_DIR=" "{DEPS_DIR}/install/gmp-{GMP_VERSION}/include".format(**locals()),
"-DGMP_LIBRARY_DIR=" "{DEPS_DIR}/install/gmp-{GMP_VERSION}/lib".format(**locals()), "-DGMP_LIBRARY_DIR=" "{DEPS_DIR}/install/gmp-{GMP_VERSION}/lib".format(**locals()),
"-DMPFR_INCLUDE_DIR=" "{DEPS_DIR}/install/mpfr-{MPFR_VERSION}/include".format(**locals()), "-DMPFR_INCLUDE_DIR=" "{DEPS_DIR}/install/mpfr-{MPFR_VERSION}/include".format(**locals()),
"-DMPFR_LIBRARY_DIR=" "{DEPS_DIR}/install/mpfr-{MPFR_VERSION}/lib".format(**locals()) "-DMPFR_LIBRARY_DIR=" "{DEPS_DIR}/install/mpfr-{MPFR_VERSION}/lib".format(**locals()),
"-DUSE_CGAL=ON"
]) ])
if "OpenCOLLADA" in targets: if "OpenCOLLADA" in targets:
@@ -807,6 +808,7 @@ if "IfcOpenShell-Python" in targets:
"-DPYTHON_LIBRARY=" +PYTHON_LIBRARY, "-DPYTHON_LIBRARY=" +PYTHON_LIBRARY,
"-DPYTHON_EXECUTABLE=" +PYTHON_EXECUTABLE, "-DPYTHON_EXECUTABLE=" +PYTHON_EXECUTABLE,
"-DPYTHON_INCLUDE_DIR=" +PYTHON_INCLUDE, "-DPYTHON_INCLUDE_DIR=" +PYTHON_INCLUDE,
"-DUSE_CGAL=ON",
"-DEIGEN_DIR=" "{DEPS_DIR}/install/Eigen-3.3.7".format(**locals()), "-DEIGEN_DIR=" "{DEPS_DIR}/install/Eigen-3.3.7".format(**locals()),
"-DSWIG_EXECUTABLE=" "{DEPS_DIR}/install/swig/bin/swig".format(**locals()), "-DSWIG_EXECUTABLE=" "{DEPS_DIR}/install/swig/bin/swig".format(**locals()),
"-DCMAKE_INSTALL_PREFIX=" "{DEPS_DIR}/install/ifcopenshell/tmp".format(**locals()), "-DCMAKE_INSTALL_PREFIX=" "{DEPS_DIR}/install/ifcopenshell/tmp".format(**locals()),
src/ifcconvert/validate_wall_connectivity.cpp
+1 -1
View File
@@ -135,7 +135,7 @@ void fix_wallconnectivity(IfcParse::IfcFile& f, bool no_progress, bool quiet, bo
std::vector<Kernel_::FT> parameters; std::vector<Kernel_::FT> parameters;
std::transform(vertices(x_poly).begin(), vertices(x_poly).end(), std::back_inserter(parameters), [&P0, D](auto& v) { std::transform(vertices(x_poly).begin(), vertices(x_poly).end(), std::back_inserter(parameters), [&P0, D](cgal_vertex_descriptor_t& v) {
return (v->point() - P0) * D; return (v->point() - P0) * D;
}); });
src/ifcconvert/validation_utils.h
+2 -2
View File
@@ -15,8 +15,8 @@
template <typename T> template <typename T>
T enlarge(const T& t, double d = 1.e-5) { T enlarge(const T& t, double d = 1.e-5) {
T::NT min[3]; typename T::NT min[3];
T::NT max[3]; typename T::NT max[3];
for (int i = 0; i < t.dimension(); ++i) { for (int i = 0; i < t.dimension(); ++i) {
min[i] = t.min_coord(i) - d; min[i] = t.min_coord(i) - d;
max[i] = t.max_coord(i) + d; max[i] = t.max_coord(i) + d;