Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-26 18:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix libxml2 directives on travis

Browse Source
This commit is contained in:
Thomas Krijnen
2018-09-02 09:35:09 +02:00
parent ad5444b974
commit 840f1463e5
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+16 -2
View File
@@ -29,7 +29,7 @@ install:
- sudo apt-get install -y liboce-ocaf-dev - sudo apt-get install -y liboce-ocaf-dev
- sudo apt-get install -y liboce-visualization-dev - sudo apt-get install -y liboce-visualization-dev
- sudo apt-get install -y liboce-ocaf-lite-dev - sudo apt-get install -y liboce-ocaf-lite-dev
- sudo apt-get install -y libxml2-dev
- sudo apt-get install -y libpcre3-dev - sudo apt-get install -y libpcre3-dev
script: script:
@@ -50,7 +50,21 @@ script:
- cd cmake - cd cmake
- mkdir build - mkdir build
- cd build - cd build
- cmake -DCOLLADA_SUPPORT=True -DOPENCOLLADA_INCLUDE_DIR=/usr/local/include/opencollada -DOPENCOLLADA_LIBRARY_DIR=/usr/local/lib/opencollada -DPCRE_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu -DBUILD_IFCPYTHON=True -DUNICODE_SUPPORT=True -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu -DPYTHON_LIBRARY=/usr/lib/python2.7/config-x86_64-linux-gnu/libpython2.7.so -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 -DPYTHON_EXECUTABLE=/usr/bin/python2.7 .. - |
cmake \
-DCOLLADA_SUPPORT=True \
-DOPENCOLLADA_INCLUDE_DIR=/usr/local/include/opencollada \
-DOPENCOLLADA_LIBRARY_DIR=/usr/local/lib/opencollada \
-DPCRE_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
-DBUILD_IFCPYTHON=True \
-DUNICODE_SUPPORT=True \
-DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
-DPYTHON_LIBRARY=/usr/lib/python2.7/config-x86_64-linux-gnu/libpython2.7.so \
-DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-DPYTHON_EXECUTABLE=/usr/bin/python2.7 \
-DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \
-DLIBXML2_LIBRARIES=/usr/lib/x86_64-linux-gnu/libxml2.a \
..
- sudo make install - sudo make install
- cd ../../test - cd ../../test
- /usr/bin/python2.7 tests.py - /usr/bin/python2.7 tests.py
src/ifcparse/parse_ifcxml.cpp
+2 -2
View File
@@ -234,7 +234,7 @@ static void end_element(void* user, const xmlChar* tag) {
} }
} }
static void characters(void* user, const xmlChar* ch, int len) { static void process_characters(void* user, const xmlChar* ch, int len) {
ifcxml_parse_state* state = (ifcxml_parse_state*)user; ifcxml_parse_state* state = (ifcxml_parse_state*)user;
if (state->file == nullptr) { if (state->file == nullptr) {
@@ -602,7 +602,7 @@ IFC_PARSE_API IfcParse::IfcFile* IfcParse::parse_ifcxml(const std::string& filen
memset(&handler, 0, sizeof(xmlSAXHandler)); memset(&handler, 0, sizeof(xmlSAXHandler));
handler.startElement = start_element; handler.startElement = start_element;
handler.endElement = end_element; handler.endElement = end_element;
handler.characters = characters; handler.characters = process_characters;
xmlSAXUserParseFile(&handler, &state, filename.c_str()); xmlSAXUserParseFile(&handler, &state, filename.c_str());