summarylogtreecommitdiffstats
path: root/gr-framework-0.46.0.patch
blob: 073bcdeec68fcbb76675c734dc77726dcfcd0ffc (plain)
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
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 64718ef9..911dd62d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -443,10 +443,11 @@ arch-cmake-system-dependencies:
   stage: build
   image: iffregistry.fz-juelich.de/docker-images/gr-build-images/arch-system-dependencies
   script:
-    - make -C 3rdparty default TARGETS="qhull"
+    - pacman -Sy
+    - pacman -S --noconfirm --needed qhull
     - mkdir build
     - cd build
-    - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DGR_USE_BUNDLED_LIBRARIES=ON
+    - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DGR_USE_BUNDLED_LIBRARIES=OFF
     - make
 
 windows-32bit-cross:
diff --git a/cmake/FindQhull.cmake b/cmake/FindQhull.cmake
index ec771f97..19a54e45 100644
--- a/cmake/FindQhull.cmake
+++ b/cmake/FindQhull.cmake
@@ -25,7 +25,7 @@
 #   If false, do not try to use Qhull.
 
 if(NOT QHULL_INCLUDE_DIR)
-  find_path(QHULL_INCLUDE_DIR qhull/qhull_a.h)
+  find_path(QHULL_INCLUDE_DIR qhull_a.h PATH_SUFFIXES qhull libqhull)
 endif()
 
 if(NOT QHULL_LIBRARY)
@@ -43,7 +43,7 @@ if(NOT QHULL_VERSION_STRING
     file(
       WRITE "${CMAKE_CURRENT_BINARY_DIR}/qhull_get_version.c"
       "
-        #include \"qhull/libqhull.h\"
+        #include \"libqhull.h\"
 
         int main(void)
         {
diff --git a/lib/gr/Makefile b/lib/gr/Makefile
index ff2e9957..6db9b86b 100644
--- a/lib/gr/Makefile
+++ b/lib/gr/Makefile
@@ -14,7 +14,7 @@ UNAME := $(shell uname)
                contourf.o boundary.o
       GSDEFS =
      DEFINES = $(GSDEFS)
-    INCLUDES = -I../gks -I$(THIRDPARTYDIR)/include
+    INCLUDES = -I../gks -I$(THIRDPARTYDIR)/include -I$(THIRDPARTYDIR)/include/qhull
           CC = cc
       CFLAGS = $(DEFINES) -O3 -Wall -fPIC $(EXTRA_CFLAGS)
           AR = ar
diff --git a/lib/gr/delaunay.c b/lib/gr/delaunay.c
index 9039f3f8..90ee44de 100644
--- a/lib/gr/delaunay.c
+++ b/lib/gr/delaunay.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "qhull/qhull_a.h"
+#include "qhull_a.h"
 
 #include "gr.h"
 
diff --git a/lib/gr/makefile.mingw b/lib/gr/makefile.mingw
index accd1dd5..6dffd64e 100644
--- a/lib/gr/makefile.mingw
+++ b/lib/gr/makefile.mingw
@@ -2,7 +2,7 @@ ifeq ($(strip $(THIRDPARTYDIR)),)
 override THIRDPARTYDIR = $(abspath $(CURDIR)/../../3rdparty/build)
 endif
 
- INCLUDES = -I$(THIRDPARTYDIR)/include -I../gks -I.
+ INCLUDES = -I$(THIRDPARTYDIR)/include -I$(THIRDPARTYDIR)/include/qhull -I../gks -I.
    CFLAGS = -DXMD_H -D_POSIX -D_WIN32_WINNT=0x0600 $(INCLUDES)
   DEFINES = -DGRDIR=\"$(GRDIR)\" -DNO_GS -DNO_X11
  JPEGLIBS = $(THIRDPARTYDIR)/lib/libjpeg.a