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

Add OpenCollada to travis and fix cmake (#119)

Browse Source 
* travis: collada support

* travis: opencollada, specify pcre library
This commit is contained in:
Bernd Hahnebach
2016-08-15 13:14:15 +02:00
committed by Thomas Krijnen
parent 9d757e1b3c
commit 8dadb71648
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+17 -1
View File
@@ -30,10 +30,26 @@ install:
- 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 libpcre3-dev
script: script:
- pwd
- cd ..
- git clone https://github.com/KhronosGroup/OpenCOLLADA.git
- cd OpenCOLLADA
- git checkout 064a60b65c2c31b94f013820856bc84fb1937cc6
- mkdir build
- cd build
- cmake ..
- make
- sudo make install
- cd ..
- cd ..
- pwd
- cd IfcOpenShell
- pwd
- cd cmake - cd cmake
- mkdir build - mkdir build
- cd build - cd build
- cmake -DCOLLADA_SUPPORT=False -DUSE_IFC4=False -DBUILD_IFCPYTHON=True -DUNICODE_SUPPORT=True -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu .. - 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 -DUSE_IFC4=False -DBUILD_IFCPYTHON=True -DUNICODE_SUPPORT=True -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu ..
- make -j2 - make -j2
cmake/CMakeLists.txt
+1 -1
View File
@@ -260,7 +260,7 @@ IF(COLLADA_SUPPORT)
find_library(pcre_library NAMES pcre PATHS ${PCRE_LIBRARY_DIR} NO_DEFAULT_PATH) find_library(pcre_library NAMES pcre PATHS ${PCRE_LIBRARY_DIR} NO_DEFAULT_PATH)
endif() endif()
if (${pcre_library}) if (pcre_library)
SET(OPENCOLLADA_LIBRARY_DIR ${OPENCOLLADA_LIBRARY_DIR} ${PCRE_LIBRARY_DIR}) SET(OPENCOLLADA_LIBRARY_DIR ${OPENCOLLADA_LIBRARY_DIR} ${PCRE_LIBRARY_DIR})
list(APPEND OPENCOLLADA_LIBRARIES "${pcre_library}") list(APPEND OPENCOLLADA_LIBRARIES "${pcre_library}")
endif() endif()