From c3058a4c0c26b5d3937faa3e079206025e13f057 Mon Sep 17 00:00:00 2001
From: Sebastian Held <sebastian.held@gmx.de>
Date: Sat, 8 Dec 2012 15:08:17 +0100
Subject: [PATCH] only add rpath to the executable, if custom library paths are
 used

openEMS does not need to explicitly link to libCGAL. libCSXCAD does this already.
---
 openEMS.pro | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/openEMS.pro b/openEMS.pro
index aa81e72..2444804 100644
--- a/openEMS.pro
+++ b/openEMS.pro
@@ -46,7 +46,7 @@ win32 {
         WIN32_LIB_ROOT = ..
     }
     isEmpty(CSXCAD_ROOT) {
-     CSXCAD_ROOT = $$WIN32_LIB_ROOT/CSXCAD
+        CSXCAD_ROOT = $$WIN32_LIB_ROOT/CSXCAD
     }
     # CSXCAD
     INCLUDEPATH += $$CSXCAD_ROOT/include/CSXCAD
@@ -76,7 +76,9 @@ win32 {
 !win32 {
     # CSXCAD
     isEmpty(CSXCAD_ROOT) {
-     CSXCAD_ROOT = /usr
+        CSXCAD_ROOT = /usr
+    } else {
+        QMAKE_LFLAGS += \'-Wl,-rpath,$$CSXCAD_ROOT/lib\'
     }
     INCLUDEPATH += $$CSXCAD_ROOT/include/CSXCAD
     LIBS += -L$$CSXCAD_ROOT/lib -lCSXCAD
@@ -84,9 +86,8 @@ win32 {
     # #3rd party libraries#
     LIBS += -lfparser
     LIBS += -ltinyxml
-	DEFINES += TIXML_USE_STL
+    DEFINES += TIXML_USE_STL
     LIBS += -lboost_thread-mt
-    LIBS += -lCGAL
     # hdf5 (and mpi for parallel hdf5)
     LIBS += -lhdf5_hl -lhdf5
     LIBS += -lmpi -lmpi_cxx
@@ -102,7 +103,6 @@ win32 {
         -lvtkIO \
         -lvtksys \
         -lvtkFiltering
-    QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../CSXCAD\'
 }
 
 # vtk includes deprecated header files; silence the corresponding warning
@@ -287,7 +287,7 @@ QMAKE_EXTRA_TARGETS += tarball
 # INSTALL (only the openEMS executable and matlab scripts)
 #
 isEmpty(PREFIX) {
- PREFIX = /usr/local
+    PREFIX = /usr/local
 }
 install.target = install
 install.commands = mkdir -p \"$$PREFIX/bin\"