Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-19 06:39:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CGAL library linking on windows, conditional IfcTriangulatedFaceSet based on schema

Browse Source
This commit is contained in:
Thomas Krijnen
2017-03-09 12:14:00 +01:00
parent deea0f6558
commit 619b4fbed5
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/CMakeLists.txt
+15 -7
View File
@@ -220,15 +220,23 @@ ENDIF()
FIND_LIBRARY(libCGAL NAMES CGAL PATHS ${CGAL_LIBRARY_DIR} NO_DEFAULT_PATH) FIND_LIBRARY(libCGAL NAMES CGAL PATHS ${CGAL_LIBRARY_DIR} NO_DEFAULT_PATH)
IF(libCGAL) IF(libCGAL)
MESSAGE(STATUS "CGAL library files found") MESSAGE(STATUS "CGAL library files found")
foreach(lib ${CGAL_LIBRARY_NAMES})
string(REPLACE libCGAL "${lib}" lib_path "${libCGAL}")
list(APPEND CGAL_LIBRARIES "${lib_path}")
endforeach()
ELSE() ELSE()
MESSAGE(FATAL_ERROR "Unable to find CGAL library files, aborting") FILE(GLOB CGAL_LIBRARIES ${CGAL_LIBRARY_DIR}/CGAL*.lib)
LIST(LENGTH CGAL_LIBRARY_NAMES num_cgal_library_names)
LIST(LENGTH CGAL_LIBRARIES num_cgal_libraries)
LINK_DIRECTORIES("${CGAL_LIBRARY_DIR}")
if(NOT "${num_cgal_library_names}" STREQUAL "${num_cgal_library_names}")
MESSAGE(FATAL_ERROR "Unable to find CGAL library files, aborting")
endif()
MESSAGE(STATUS "CGAL library files found")
ENDIF() ENDIF()
foreach(lib ${CGAL_LIBRARY_NAMES}) # TODO: Remove hardcoded version numbers for windows
string(REPLACE libCGAL "${lib}" lib_path "${libCGAL}") FIND_LIBRARY(libGMP NAMES gmp "libgmp-10" PATHS ${GMP_LIBRARY_DIR} NO_DEFAULT_PATH)
list(APPEND CGAL_LIBRARIES "${lib_path}") FIND_LIBRARY(libMPFR NAMES mpfr "libmpfr-4" PATHS ${MPFR_LIBRARY_DIR} NO_DEFAULT_PATH)
endforeach()
FIND_LIBRARY(libGMP NAMES gmp PATHS ${GMP_LIBRARY_DIR} NO_DEFAULT_PATH)
FIND_LIBRARY(libMPFR NAMES mpfr PATHS ${MPFR_LIBRARY_DIR} NO_DEFAULT_PATH)
IF(NOT libGMP) IF(NOT libGMP)
MESSAGE(FATAL_ERROR "Unable to find GMP library files, aborting") MESSAGE(FATAL_ERROR "Unable to find GMP library files, aborting")
ENDIF() ENDIF()
src/ifcgeom/kernels/cgal/CgalEntityMapping.h
+2
View File
@@ -46,7 +46,9 @@ SHAPE(IfcSphere);
SHAPE(IfcRectangularPyramid); SHAPE(IfcRectangularPyramid);
SHAPE(IfcRightCircularCylinder); SHAPE(IfcRightCircularCylinder);
SHAPE(IfcRightCircularCone); SHAPE(IfcRightCircularCone);
#ifdef USE_IFC4
SHAPE(IfcTriangulatedFaceSet); SHAPE(IfcTriangulatedFaceSet);
#endif
SHAPE(IfcHalfSpaceSolid); SHAPE(IfcHalfSpaceSolid);
FACE(IfcArbitraryClosedProfileDef); FACE(IfcArbitraryClosedProfileDef);
src/ifcgeom/kernels/cgal/CgalIfcGeomShapes.cpp
+2
View File
@@ -876,6 +876,7 @@ bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcRightCircularCone* l, cgal
return true; return true;
} }
#ifdef USE_IFC4
bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcTriangulatedFaceSet* l, cgal_shape_t& shape) { bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcTriangulatedFaceSet* l, cgal_shape_t& shape) {
IfcSchema::IfcCartesianPointList3D* point_list = l->Coordinates(); IfcSchema::IfcCartesianPointList3D* point_list = l->Coordinates();
const std::vector< std::vector<double> > coordinates = point_list->CoordList(); const std::vector< std::vector<double> > coordinates = point_list->CoordList();
@@ -937,6 +938,7 @@ bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcTriangulatedFaceSet* l, cg
shape = CGAL::Nef_polyhedron_3<Kernel>(polyhedron); shape = CGAL::Nef_polyhedron_3<Kernel>(polyhedron);
return true; return true;
} }
#endif
bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcHalfSpaceSolid* l, cgal_shape_t& shape) { bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcHalfSpaceSolid* l, cgal_shape_t& shape) {
IfcSchema::IfcSurface* surface = l->BaseSurface(); IfcSchema::IfcSurface* surface = l->BaseSurface();