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

Bring back logic for BUILD_SHARED_LIBS.

Browse Source 
Also remove C++11 code.
This commit is contained in:
Johannes Obermayr
2016-06-14 20:30:02 +02:00
parent be10bc46ca
commit ea6fbc77dd
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/CMakeLists.txt
+8 -4
View File
@@ -432,7 +432,11 @@ if(NOT WIN32)
LINK_DIRECTORIES(${LINK_DIRECTORIES} /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64) LINK_DIRECTORIES(${LINK_DIRECTORIES} /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64)
endif() endif()
SET(IFCOPENSHELL_LIBRARIES IfcParse IfcGeom) if(BUILD_SHARED_LIBS)
SET(IFCOPENSHELL_LIBRARIES IfcGeom)
else()
SET(IFCOPENSHELL_LIBRARIES IfcParse IfcGeom)
endif()
# IfcParse # IfcParse
file(GLOB IFCPARSE_H_FILES ../src/ifcparse/*.h) file(GLOB IFCPARSE_H_FILES ../src/ifcparse/*.h)
@@ -448,7 +452,7 @@ endforeach()
set(IFCPARSE_FILES ${IFCPARSE_CPP_FILES} ${IFCPARSE_H_FILES}) set(IFCPARSE_FILES ${IFCPARSE_CPP_FILES} ${IFCPARSE_H_FILES})
add_library(IfcParse ${IFCPARSE_FILES}) add_library(IfcParse STATIC ${IFCPARSE_FILES})
set_target_properties(IfcParse PROPERTIES COMPILE_FLAGS -DIfcParse_EXPORTS) set_target_properties(IfcParse PROPERTIES COMPILE_FLAGS -DIfcParse_EXPORTS)
IF(UNICODE_SUPPORT) IF(UNICODE_SUPPORT)
@@ -461,7 +465,7 @@ file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/*.cpp)
set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES}) set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES})
IF(BUILD_SHARED_LIBS) IF(BUILD_SHARED_LIBS)
message(WARNING "Building IfcGeom as shared library not currently supported") message(WARNING "Building IfcGeom as shared library not currently supported")
add_library(IfcGeom STATIC ${IFCGEOM_FILES}) add_library(IfcGeom SHARED ${IFCGEOM_FILES})
ELSE() ELSE()
add_library(IfcGeom ${IFCGEOM_FILES}) add_library(IfcGeom ${IFCGEOM_FILES})
ENDIF() ENDIF()
@@ -524,7 +528,7 @@ INSTALL(FILES ${IFCGEOM_H_FILES}
DESTINATION ${INCLUDEDIR}/ifcgeom DESTINATION ${INCLUDEDIR}/ifcgeom
) )
INSTALL(TARGETS IfcParse IfcGeom IfcConvert IfcGeomServer INSTALL(TARGETS ${IFCOPENSHELL_LIBRARIES} IfcConvert IfcGeomServer
ARCHIVE DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR}
LIBRARY DESTINATION ${LIBDIR} LIBRARY DESTINATION ${LIBDIR}
RUNTIME DESTINATION ${BINDIR} RUNTIME DESTINATION ${BINDIR}
src/ifcparse/IfcParse.cpp
+2 -2
View File
@@ -559,9 +559,9 @@ double TokenFunc::asFloat(const Token& t) {
const std::string &TokenFunc::asStringRef(const Token& t) { const std::string &TokenFunc::asStringRef(const Token& t) {
std::string &str = t.lexer->GetTempString(); std::string &str = t.lexer->GetTempString();
t.lexer->TokenString(t.startPos, str); t.lexer->TokenString(t.startPos, str);
if (isString(t) || isEnumeration(t) || isBinary(t)) { if ((isString(t) || isEnumeration(t) || isBinary(t)) && !str.empty()) {
//remove start+end characters in-place //remove start+end characters in-place
str.pop_back(); str.erase(str.end()-1);
str.erase(str.begin()); str.erase(str.begin());
} }
return str; return str;