File: fix-building-of-remaining-binaries.patch

package info (click to toggle)
openscad 2015.03-2%2Bdfsg-2
  • links: PTS, VCS
  • area: main
  • in suites: stretch
  • size: 30,804 kB
  • ctags: 5,692
  • sloc: cpp: 39,386; sh: 3,856; ansic: 3,674; python: 1,393; yacc: 496; lex: 272; lisp: 159; makefile: 67; xml: 60
file content (30 lines) | stat: -rw-r--r-- 1,135 bytes parent folder | download
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
From: chrysn <chrysn@fsfe.org>
Date: Sun, 7 Jun 2015 15:32:36 +0200
Subject: fix building of remaining binaries

the previous patch has removed the -DENABLE_EXPERIMENTAL flag, assuming
that it is not required any more without openscad_nogui being built.
while that is sufficient for the test suite, other binaries built in the
tests/ directory would still use those flags.

in order to make them buildable again, the -DOPENSCAD_NOGUI compile time
option is added (as the resulting binaries are command-line-only tools,
which was previously implicit by setting -DOPENSCAD_TESTING), and
-DENABLE_EXPERIMENTAL is restored.
---
 tests/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0e0b46c..4f45fea 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -600,6 +600,8 @@ if (DEFINED OPENSCAD_DAY)
   add_definitions(-DOPENSCAD_DAY=${OPENSCAD_DAY})
 endif()
 
+add_definitions(-DENABLE_EXPERIMENTAL -DOPENSCAD_NOGUI)
+
 # Search for MCAD in correct place
 #set(CTEST_ENVIRONMENT "${CTEST_ENVIRONMENT};OPENSCADPATH=${CMAKE_CURRENT_SOURCE_DIR}/../libraries")