1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
From: chrysn <chrysn@fsfe.org>
Date: Fri, 7 Mar 2014 09:19:29 +0100
Subject: don't override OPENSCADPATH
the debian tests scripts already set an adaequate OPENSCADPATH; the
overrides in the test scripts would set that wrongly again (beause
openscad and mcad are not built in the same tree in debian)
for a cleaner solution, the library path should be respected
unconditionally, removing the necessity for debian to specify a path at
all.
---
tests/CMakeLists.txt | 2 +-
tests/CTestCustom.template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 156db11..7365674 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -603,7 +603,7 @@ endif()
add_definitions(-DOPENSCAD_TESTING -DENABLE_EXPERIMENTAL)
# Search for MCAD in correct place
-set(CTEST_ENVIRONMENT "${CTEST_ENVIRONMENT};OPENSCADPATH=${CMAKE_CURRENT_SOURCE_DIR}/../libraries")
+#set(CTEST_ENVIRONMENT "${CTEST_ENVIRONMENT};OPENSCADPATH=${CMAKE_CURRENT_SOURCE_DIR}/../libraries")
# Platform specific settings
diff --git a/tests/CTestCustom.template b/tests/CTestCustom.template
index 208cd47..f754c27 100644
--- a/tests/CTestCustom.template
+++ b/tests/CTestCustom.template
@@ -12,7 +12,7 @@
# Part 0. Finding MCAD
-set(ENV{OPENSCADPATH} "__cmake_current_source_dir__/../libraries")
+#set(ENV{OPENSCADPATH} "__cmake_current_source_dir__/../libraries")
# Part 1. X11 and Virtual Framebuffer, for headless Linux/BSD systems.
# This is not used by Windows or Mac because they have alternate means
|
