diff options
| author | clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-01-31 00:31:26 (GMT) |
|---|---|---|
| committer | clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-01-31 00:31:26 (GMT) |
| commit | ea77e90a5463428a54cff9ab25c84c9c8687882e (patch) | |
| tree | a594f6937efb3f2306c6a2adc9838268618e8cec | |
| parent | 8f759f3f843ee4977e20be6b6e30dcf4a5ea7673 (diff) | |
Clifford Wolf:
Fixed EIGEN2_DIR and OPENCSG_DIR qmake handling
git-svn-id: http://svn.clifford.at/openscad/trunk@383 b57f626f-c46c-0410-a088-ec61d464b74c
| -rw-r--r-- | opencsg.pri | 2 | ||||
| -rw-r--r-- | openscad.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/opencsg.pri b/opencsg.pri index 3b54f0f..0ae05d2 100644 --- a/opencsg.pri +++ b/opencsg.pri @@ -6,7 +6,7 @@ opencsg { # Optionally specify location of OpenCSG using the # OPENCSGDIR env. variable - OPENCSG_DIR = $(OPENCSGDIR) + OPENCSG_DIR = $$(OPENCSGDIR) !isEmpty(OPENCSG_DIR) { INCLUDEPATH += $$OPENCSG_DIR/include LIBS += -L$$OPENCSG_DIR/lib diff --git a/openscad.pro b/openscad.pro index 4a8bdf2..5000c13 100644 --- a/openscad.pro +++ b/openscad.pro @@ -41,7 +41,7 @@ include(opencsg.pri) # Optionally specify location of Eigen2 using the # EIGEN2DIR env. variable -EIGEN2_DIR = $(EIGEN2DIR) +EIGEN2_DIR = $$(EIGEN2DIR) !isEmpty(EIGEN2_DIR) { INCLUDEPATH += $$EIGEN2_DIR } |