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
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
|
Add curl support for the cli app and base library and make it truly optional
for gmic-qt instead of automagic.
--- gmic-2.4.3/CMakeLists.txt
+++ gmic-2.4.3/CMakeLists.txt
@@ -83,6 +83,7 @@
option(BUILD_MAN "Build the manpage" ON)
option(BUILD_BASH_COMPLETION "Build Bash completion" ON)
option(CUSTOM_CFLAGS "Override default compiler optimization flags" OFF)
+option(ENABLE_CURL "Add support for curl" ON)
option(ENABLE_X "Add support for X11" ON)
option(ENABLE_FFMPEG "Add support for FFMpeg" ON)
option(ENABLE_FFTW "Add support for FFTW" ON)
@@ -136,6 +137,16 @@
link_directories(${ZLIB_LIBRARY_DIRS})
endif()
+# curl support
+if(ENABLE_CURL)
+ find_package(CURL)
+endif()
+if(CURL_FOUND)
+ set(COMPILE_FLAGS "${COMPILE_FLAGS} -Dcimg_use_curl")
+ include_directories(${CURL_INCLUDE_DIRS})
+ link_directories(${CURL_LIBRARY_DIRS})
+endif()
+
#X11 support
if(ENABLE_X)
find_package(X11)
@@ -288,6 +299,7 @@
${OPENEXR_LIBRARIES}
${OPENCV_LIBRARIES}
${ZLIB_LIBRARIES}
+ ${CURL_LIBRARIES}
${FFTW3_LIBRARIES}
${EXTRA_LIBRARIES}
)
@@ -316,6 +328,7 @@
${OPENEXR_LIBRARIES}
${OPENCV_LIBRARIES}
${ZLIB_LIBRARIES}
+ ${CURL_LIBRARIES}
${FFTW3_LIBRARIES}
${EXTRA_LIBRARIES}
)
@@ -345,6 +358,7 @@
${OPENEXR_LIBRARIES}
${OPENCV_LIBRARIES}
${ZLIB_LIBRARIES}
+ ${CURL_LIBRARIES}
${FFTW3_LIBRARIES}
${EXTRA_LIBRARIES}
)
--- gmic-2.4.3/gmic-qt/CMakeLists.txt
+++ gmic-2.4.3/gmic-qt/CMakeLists.txt
@@ -30,6 +30,7 @@
message("G'MIC path: " ${GMIC_PATH})
option(ENABLE_DYNAMIC_LINKING "Dynamically link the binaries to the GMIC shared library" OFF)
+option(ENABLE_CURL "Add support for curl" ON)
set (GMIC_LIB_PATH "${GMIC_PATH}" CACHE STRING "Define the path to the GMIC shared library")
#
@@ -149,10 +150,12 @@
#
# CURL
#
-find_package(CURL)
-if (CURL_FOUND)
- add_definitions(-Dcimg_use_curl)
- include_directories(SYSTEM ${CURL_INCLUDE_DIRS} )
+if(ENABLE_CURL)
+ find_package(CURL)
+ if (CURL_FOUND)
+ add_definitions(-Dcimg_use_curl)
+ include_directories(SYSTEM ${CURL_INCLUDE_DIRS} )
+ endif()
endif()
#
@@ -187,11 +190,13 @@
${ZLIB_LIBRARIES}
)
-if (CURL_FOUND)
- set(gmic_qt_LIBRARIES
- ${gmic_qt_LIBRARIES}
- ${CURL_LIBRARIES}
- )
+if(ENABLE_CURL)
+ if (CURL_FOUND)
+ set(gmic_qt_LIBRARIES
+ ${gmic_qt_LIBRARIES}
+ ${CURL_LIBRARIES}
+ )
+ endif()
endif()
add_definitions(-Dgmic_build)
|
GitWeb