Add OpenCollada to travis and fix cmake (IfcOpenShell#119)

berndhahnebach · aothms · commit 8dadb71648cf · 2016-08-15T13:14:15.000+02:00
* travis: collada support

* travis: opencollada, specify pcre library
diff --git a/.travis.yml b/.travis.yml
@@ -30,10 +30,26 @@ install:
   - sudo apt-get install -y liboce-visualization-dev
   - sudo apt-get install -y liboce-ocaf-lite-dev
 
+  - sudo apt-get install -y libpcre3-dev
 
 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
   - mkdir 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
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -260,7 +260,7 @@ IF(COLLADA_SUPPORT)
 			find_library(pcre_library NAMES pcre PATHS ${PCRE_LIBRARY_DIR} NO_DEFAULT_PATH)
 		endif()
 		
-		if (${pcre_library})
+		if (pcre_library)
 			SET(OPENCOLLADA_LIBRARY_DIR ${OPENCOLLADA_LIBRARY_DIR} ${PCRE_LIBRARY_DIR})
 			list(APPEND OPENCOLLADA_LIBRARIES "${pcre_library}")
 		endif()
