From e064098f846368b6acd800b4c9ff2c285e9a9c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ali=20K=C3=A4m=C3=A4r=C3=A4inen?= <stinkfist0@gmail.com>
Date: Mon, 22 Aug 2016 12:45:37 +0300
Subject: [PATCH] Build instructions and PCRE lib dir (#120)

* CMakeLists.txt: show fatal error if PCRE not found if COLLADA_SUPPORT is on.

* Compiling on *nix instruction tweaks.
---
 README.md            | 30 ++++++++++++------------------
 cmake/CMakeLists.txt |  7 +++++--
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 263811ca65..64088e6e93 100644
--- a/README.md
+++ b/README.md
@@ -88,14 +88,14 @@ for additional information):
 
     $ sudo apt-get install liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev liboce-visualization-dev liboce-ocaf-lite-dev
 
-If not, you will need to compile Open CASCADE yourself:
+If not, you will need to compile Open CASCADE yourself (note that the build takes a long time):
 
     $ sudo apt-get install libftgl-dev libtbb2 libtbb-dev libgl1-mesa-dev libfreetype6-dev
     $ git clone https://github.com/tpaviot/oce.git
     $ cd oce
     $ mkdir build && cd build
     $ cmake ..
-    $ make
+    $ make -j
     $ sudo make install
 
 For building IfcConvert with COLLADA (.dae) support (on by default), OpenCOLLADA is needed:
@@ -107,30 +107,24 @@ For building IfcConvert with COLLADA (.dae) support (on by default), OpenCOLLADA
     $ git checkout 064a60b65c2c31b94f013820856bc84fb1937cc6
     $ mkdir build && cd build
     $ cmake ..
-    $ make
+    $ make -j
     $ sudo make install
 
 For building the IfcPython wrapper (on by default), SWIG and Python development are needed, if not already available:
 
     $ sudo apt-get install python-all-dev swig
 
-To build IfcOpenShell please take the following steps:
+To build IfcOpenShell please take the following steps. Alternatively use environment variables for setting the
+dependencies' paths. `OCC_INCLUDE_DIR` might be needed to set also. `OPENCOLLADA_INCLUDE_DIR` and `OPENCOLLADA_LIBRARY_DIR`
+(and potentially `PCRE_LIBRARY_DIR`) are needed if building with COLLADA support. (`-DCOLLADA_SUPPORT=0` disables it).
 
     $ cd /path/to/IfcOpenShell
-    $ mkdir build
-    $ cd build
-    Optionally, if required:
-        $ OCC_INCLUDE_PATH="/path/to/OpenCASCADE/include"
-        $ OCC_LIBRARY_PATH="/path/to/OpenCASCADE/lib"
-        $ export OCC_INCLUDE_PATH
-        $ export OCC_LIBRARY_PATH
-    If building with COLLADA support (path might vary):
-        $ OPENCOLLADA_INCLUDE_DIR="/usr/local/include/opencollada"
-        $ OPENCOLLADA_LIBRARY_DIR="/usr/local/lib/opencollada"
-        $ export OPENCOLLADA_INCLUDE_DIR
-        $ export OPENCOLLADA_LIBRARY_DIR
-    $ cmake ../cmake
-    $ make
+    $ mkdir build && cd build
+    $ cmake ../cmake -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu/ \
+          -DOPENCOLLADA_INCLUDE_DIR="/usr/local/include/opencollada" \
+          -DOPENCOLLADA_LIBRARY_DIR="/usr/local/lib/opencollada"  \
+          -DPCRE_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu/
+    $ make -j
 
 If all worked out correctly you can now use IfcOpenShell. See the examples below.
 
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 1011d310d5..4ea07a9631 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -259,12 +259,15 @@ IF(COLLADA_SUPPORT)
 		else()
 			find_library(pcre_library NAMES pcre PATHS ${PCRE_LIBRARY_DIR} NO_DEFAULT_PATH)
 		endif()
-		
+
 		if (pcre_library)
 			SET(OPENCOLLADA_LIBRARY_DIR ${OPENCOLLADA_LIBRARY_DIR} ${PCRE_LIBRARY_DIR})
 			list(APPEND OPENCOLLADA_LIBRARIES "${pcre_library}")
+        else()
+            message(FATAL_ERROR "COLLADA_SUPPORT enabled, but unable to find PCRE. "
+                "Disable COLLADA_SUPPORT or fix PCRE_LIBRARY_DIR path to proceed.")
 		endif()
-		
+
 		IF(MSVC)
 			ADD_DEBUG_VARIANTS(OPENCOLLADA_LIBRARIES "${OPENCOLLADA_LIBRARIES}" "d")
 		ENDIF()