Skip to content

Commit 65d69c8

Browse files
committed
cmake: remove unused checks, options, and symbols
1 parent e4b8823 commit 65d69c8

File tree

16 files changed

+38
-327
lines changed

16 files changed

+38
-327
lines changed

CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
4040

4141
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
4242

43-
# Distinguish between community and non-community builds, with the
44-
# default being a community build. This does not impact the feature
45-
# set that will be compiled in; it's merely provided as a hint to
46-
# custom packaging steps.
47-
OPTION(COMMUNITY_BUILD "Set to true if this is a community build" ON)
48-
4943
# Use a default manufacturer if no manufacturer was identified.
5044
IF(NOT DEFINED MANUFACTURER)
5145
SET(MANUFACTURER "Built from Source" CACHE STRING
@@ -170,13 +164,11 @@ IF(DISABLE_SHARED)
170164
SET(WITHOUT_DYNAMIC_PLUGINS 1)
171165
ENDIF()
172166
OPTION(ENABLED_PROFILING "Enable profiling" ON)
173-
OPTION(CYBOZU "" OFF)
174167
OPTION(WITHOUT_SERVER "Build only the client library and clients" OFF)
175168
IF(UNIX)
176169
OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
177170
ENDIF()
178171
OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON)
179-
MARK_AS_ADVANCED(CYBOZU)
180172

181173
OPTION(NOT_FOR_DISTRIBUTION "Allow linking with GPLv2-incompatible system libraries. Only set it you never plan to distribute the resulting binaries" OFF)
182174

cmake/os/WindowsCache.cmake

Lines changed: 1 addition & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
IF(MSVC)
2323
SET(BFD_H_EXISTS 0 CACHE INTERNAL "")
2424
SET(HAVE_ACCESS 1 CACHE INTERNAL "")
25-
SET(HAVE_AIO_H CACHE INTERNAL "")
26-
SET(HAVE_AIO_READ CACHE INTERNAL "")
2725
SET(HAVE_ALARM CACHE INTERNAL "")
2826
SET(HAVE_ALLOCA_H CACHE INTERNAL "")
2927
SET(HAVE_ARPA_INET_H CACHE INTERNAL "")
@@ -32,56 +30,41 @@ SET(HAVE_BACKTRACE CACHE INTERNAL "")
3230
SET(HAVE_BACKTRACE_SYMBOLS CACHE INTERNAL "")
3331
SET(HAVE_BACKTRACE_SYMBOLS_FD CACHE INTERNAL "")
3432
SET(HAVE_BFILL CACHE INTERNAL "")
35-
SET(HAVE_BMOVE CACHE INTERNAL "")
3633
SET(HAVE_BSD_SIGNALS CACHE INTERNAL "")
37-
SET(HAVE_BSEARCH 1 CACHE INTERNAL "")
3834
SET(HAVE_BSS_START CACHE INTERNAL "")
39-
SET(HAVE_BZERO CACHE INTERNAL "")
40-
SET(HAVE_CHOWN CACHE INTERNAL "")
4135
SET(HAVE_CLOCK_GETTIME CACHE INTERNAL "")
4236
SET(HAVE_COMPRESS CACHE INTERNAL "")
4337
SET(HAVE_CRYPT CACHE INTERNAL "")
4438
SET(HAVE_CRYPT_H CACHE INTERNAL "")
4539
SET(HAVE_CUSERID CACHE INTERNAL "")
46-
SET(HAVE_CXX_NEW 1 CACHE INTERNAL "")
4740
SET(HAVE_DECL_MADVISE CACHE INTERNAL "")
48-
SET(HAVE_DIRECTIO CACHE INTERNAL "")
4941
SET(HAVE_DIRENT_H CACHE INTERNAL "")
5042
SET(HAVE_DLERROR CACHE INTERNAL "")
5143
SET(HAVE_DLFCN_H CACHE INTERNAL "")
5244
SET(HAVE_DLOPEN CACHE INTERNAL "")
53-
SET(HAVE_DOPRNT CACHE INTERNAL "")
5445
SET(HAVE_EXECINFO_H CACHE INTERNAL "")
5546
SET(HAVE_FCHMOD CACHE INTERNAL "")
5647
SET(HAVE_FCNTL CACHE INTERNAL "")
5748
SET(HAVE_FCNTL_H 1 CACHE INTERNAL "")
5849
SET(HAVE_FCNTL_NONBLOCK CACHE INTERNAL "")
59-
SET(HAVE_FCONVERT CACHE INTERNAL "")
6050
SET(HAVE_FDATASYNC CACHE INTERNAL "")
6151
SET(HAVE_DECL_FDATASYNC CACHE INTERNAL "")
6252
SET(HAVE_FEDISABLEEXCEPT CACHE INTERNAL "")
6353
SET(HAVE_FENV_H CACHE INTERNAL "")
6454
SET(HAVE_FESETROUND CACHE INTERNAL "")
65-
SET(HAVE_FGETLN CACHE INTERNAL "")
6655
SET(HAVE_FINITE CACHE INTERNAL "")
6756
SET(HAVE_FINITE_IN_MATH_H CACHE INTERNAL "")
68-
SET(HAVE_FLOATINGPOINT_H CACHE INTERNAL "")
6957
SET(HAVE_FLOAT_H 1 CACHE INTERNAL "")
70-
SET(HAVE_FLOCKFILE CACHE INTERNAL "")
7158
SET(HAVE_FNMATCH_H CACHE INTERNAL "")
72-
SET(HAVE_FPSETMASK CACHE INTERNAL "")
7359
SET(HAVE_FPU_CONTROL_H CACHE INTERNAL "")
7460
SET(HAVE_FSEEKO CACHE INTERNAL "")
7561
SET(HAVE_FSYNC CACHE INTERNAL "")
7662
SET(HAVE_FTIME 1 CACHE INTERNAL "")
7763
SET(HAVE_FTRUNCATE CACHE INTERNAL "")
78-
SET(HAVE_GETADDRINFO 1 CACHE INTERNAL "")
7964
SET(HAVE_GETIFADDRS CACHE INTERNAL "")
8065
SET(HAVE_GETCWD 1 CACHE INTERNAL "")
8166
SET(HAVE_GETHOSTBYADDR_R CACHE INTERNAL "")
8267
SET(HAVE_GETHRTIME CACHE INTERNAL "")
83-
SET(HAVE_GETLINE CACHE INTERNAL "")
84-
SET(HAVE_GETNAMEINFO CACHE INTERNAL "")
8568
SET(HAVE_GETPAGESIZE CACHE INTERNAL "")
8669
SET(HAVE_GETPASS CACHE INTERNAL "")
8770
SET(HAVE_GETPASSPHRASE CACHE INTERNAL "")
@@ -102,18 +85,12 @@ SET(HAVE_IPPROTO_IPV6 CACHE INTERNAL "")
10285
SET(HAVE_IPV6 TRUE CACHE INTERNAL "")
10386
SET(HAVE_IPV6_V6ONLY 1 CACHE INTERNAL "")
10487
SET(HAVE_ISINF CACHE INTERNAL "")
105-
SET(HAVE_ISSETUGID CACHE INTERNAL "")
106-
SET(HAVE_GETUID CACHE INTERNAL "")
107-
SET(HAVE_GETEUID CACHE INTERNAL "")
108-
SET(HAVE_GETGID CACHE INTERNAL "")
109-
SET(HAVE_GETEGID CACHE INTERNAL "")
11088
SET(HAVE_LANGINFO_H CACHE INTERNAL "")
11189
SET(HAVE_LDIV 1 CACHE INTERNAL "")
11290
SET(HAVE_LIMITS_H 1 CACHE INTERNAL "")
11391
SET(HAVE_LOCALE_H 1 CACHE INTERNAL "")
11492
SET(HAVE_LOCALTIME_R 1 CACHE INTERNAL "")
11593
SET(HAVE_LOG2 CACHE INTERNAL "")
116-
SET(HAVE_LONGJMP 1 CACHE INTERNAL "")
11794
SET(HAVE_LRAND48 CACHE INTERNAL "")
11895
SET(HAVE_LSTAT CACHE INTERNAL "")
11996
SET(HAVE_MADVISE CACHE INTERNAL "")
@@ -141,8 +118,6 @@ SET(HAVE_PAM_APPL_H CACHE INTERNAL "")
141118
SET(HAVE_POLL_H CACHE INTERNAL "")
142119
SET(HAVE_POPEN CACHE INTERNAL "")
143120
SET(HAVE_POLL CACHE INTERNAL "")
144-
SET(HAVE_PORT_CREATE CACHE INTERNAL "")
145-
SET(HAVE_PORT_H CACHE INTERNAL "")
146121
SET(HAVE_POSIX_FALLOCATE CACHE INTERNAL "")
147122
SET(HAVE_POSIX_SIGNALS CACHE INTERNAL "")
148123
SET(HAVE_PREAD CACHE INTERNAL "")
@@ -152,12 +127,10 @@ SET(HAVE_PTHREAD_ATTR_GETSTACKSIZE CACHE INTERNAL "")
152127
SET(HAVE_PTHREAD_ATTR_SETSCOPE CACHE INTERNAL "")
153128
SET(HAVE_PTHREAD_ATTR_SETSTACKSIZE CACHE INTERNAL "")
154129
SET(HAVE_PTHREAD_CONDATTR_CREATE CACHE INTERNAL "")
155-
SET(HAVE_PTHREAD_CONDATTR_SETCLOCK CACHE INTERNAL "")
156130
SET(HAVE_PTHREAD_INIT CACHE INTERNAL "")
157131
SET(HAVE_PTHREAD_KEY_DELETE CACHE INTERNAL "")
158132
SET(HAVE_PTHREAD_RWLOCK_RDLOCK CACHE INTERNAL "")
159133
SET(HAVE_PTHREAD_SIGMASK CACHE INTERNAL "")
160-
SET(HAVE_PTHREAD_THREADMASK CACHE INTERNAL "")
161134
SET(HAVE_PTHREAD_YIELD_NP CACHE INTERNAL "")
162135
SET(HAVE_PTHREAD_YIELD_ZERO_ARG CACHE INTERNAL "")
163136
SET(HAVE_PUTENV 1 CACHE INTERNAL "")
@@ -167,37 +140,23 @@ SET(HAVE_READDIR_R CACHE INTERNAL "")
167140
SET(HAVE_READLINK CACHE INTERNAL "")
168141
SET(HAVE_READ_REAL_TIME CACHE INTERNAL "")
169142
SET(HAVE_REALPATH CACHE INTERNAL "")
170-
SET(HAVE_REGCOMP CACHE INTERNAL "")
171143
SET(HAVE_RENAME 1 CACHE INTERNAL "")
172-
SET(HAVE_RE_COMP CACHE INTERNAL "")
173144
SET(HAVE_RINT CACHE INTERNAL "")
174145
SET(HAVE_RWLOCK_INIT CACHE INTERNAL "")
175146
SET(HAVE_SCHED_H CACHE INTERNAL "")
176147
SET(HAVE_SCHED_YIELD CACHE INTERNAL "")
177148
SET(HAVE_SELECT 1 CACHE INTERNAL "")
178149
SET(HAVE_SELECT_H CACHE INTERNAL "")
179-
SET(HAVE_SEMAPHORE_H CACHE INTERNAL "")
180150
SET(HAVE_SETENV CACHE INTERNAL "")
181-
SET(HAVE_SETFD CACHE INTERNAL "")
182151
SET(HAVE_SETLOCALE 1 CACHE INTERNAL "")
183-
SET(HAVE_SHMAT CACHE INTERNAL "")
184-
SET(HAVE_SHMCTL CACHE INTERNAL "")
185-
SET(HAVE_SHMDT CACHE INTERNAL "")
186-
SET(HAVE_SHMGET CACHE INTERNAL "")
187152
SET(HAVE_SIGACTION CACHE INTERNAL "")
188-
SET(HAVE_SIGADDSET CACHE INTERNAL "")
189-
SET(HAVE_SIGEMPTYSET CACHE INTERNAL "")
190-
SET(HAVE_SIGHOLD CACHE INTERNAL "")
191153
SET(HAVE_SIGINT 1 CACHE INTERNAL "")
192154
SET(HAVE_SIGPIPE CACHE INTERNAL "")
193155
SET(HAVE_SIGQUIT CACHE INTERNAL "")
194156
SET(HAVE_SIGSET CACHE INTERNAL "")
195157
SET(HAVE_SIGTERM 1 CACHE INTERNAL "")
196158
SET(HAVE_SIGTHREADMASK CACHE INTERNAL "")
197159
SET(HAVE_SIGWAIT CACHE INTERNAL "")
198-
SET(HAVE_SIZEOF_BOOL FALSE CACHE INTERNAL "")
199-
SET(HAVE_SIZEOF_CHAR TRUE CACHE INTERNAL "")
200-
SET(SIZEOF_CHAR 1 CACHE INTERNAL "")
201160
SET(HAVE_SIZEOF_CHARP TRUE CACHE INTERNAL "")
202161
SET(SIZEOF_CHARP ${CMAKE_SIZEOF_VOID_P} CACHE INTERNAL "")
203162
SET(HAVE_SIZEOF_IN6_ADDR TRUE CACHE INTERNAL "")
@@ -214,21 +173,17 @@ SET(SIZEOF_LONG_LONG 8 CACHE INTERNAL "")
214173
SET(HAVE_SIZEOF_MODE_T FALSE CACHE INTERNAL "")
215174
SET(HAVE_SIZEOF_OFF_T TRUE CACHE INTERNAL "")
216175
SET(SIZEOF_OFF_T 4 CACHE INTERNAL "")
217-
SET(HAVE_SIZEOF_SHORT TRUE CACHE INTERNAL "")
218-
SET(SIZEOF_SHORT 2 CACHE INTERNAL "")
219176
SET(HAVE_SIZEOF_SIGSET_T FALSE CACHE INTERNAL "")
220177
SET(HAVE_SIZEOF_SIZE_T TRUE CACHE INTERNAL "")
221178
SET(SIZEOF_SIZE_T ${CMAKE_SIZEOF_VOID_P} CACHE INTERNAL "")
222179
SET(HAVE_SIZEOF_SOCKADDR_IN6 TRUE CACHE INTERNAL "")
223-
SET(HAVE_SIZEOF_SOCKLEN_T FALSE CACHE INTERNAL "")
224180
SET(HAVE_SIZEOF_UCHAR FALSE CACHE INTERNAL "")
225181
SET(HAVE_SIZEOF_UINT FALSE CACHE INTERNAL "")
226182
SET(HAVE_SIZEOF_UINT16 FALSE CACHE INTERNAL "")
227183
SET(HAVE_SIZEOF_UINT32 FALSE CACHE INTERNAL "")
228184
SET(HAVE_SIZEOF_UINT64 FALSE CACHE INTERNAL "")
229185
SET(HAVE_SIZEOF_UINT8 FALSE CACHE INTERNAL "")
230186
SET(HAVE_SIZEOF_ULONG FALSE CACHE INTERNAL "")
231-
SET(HAVE_SIZEOF_U_INT32_T FALSE CACHE INTERNAL "")
232187
SET(HAVE_SIZE_OF_SSIZE_T FALSE CACHE INTERNAL "")
233188
SET(HAVE_SLEEP CACHE INTERNAL "")
234189
SET(HAVE_SOCKADDR_STORAGE_SS_FAMILY 1 CACHE INTERNAL "")
@@ -241,30 +196,20 @@ SET(HAVE_STDLIB_H 1 CACHE INTERNAL "")
241196
SET(HAVE_STPCPY CACHE INTERNAL "")
242197
SET(HAVE_STRCASECMP CACHE INTERNAL "")
243198
SET(HAVE_STRCOLL 1 CACHE INTERNAL "")
244-
SET(HAVE_STRDUP 1 CACHE INTERNAL "")
245199
SET(HAVE_STRERROR 1 CACHE INTERNAL "")
246200
SET(HAVE_STRINGS_H CACHE INTERNAL "")
247201
SET(HAVE_STRING_H 1 CACHE INTERNAL "")
248-
SET(HAVE_STRLCAT CACHE INTERNAL "")
249-
SET(HAVE_STRLCPY CACHE INTERNAL "")
250-
SET(HAVE_STRNCASECMP CACHE INTERNAL "")
251202
SET(HAVE_STRNDUP CACHE INTERNAL "")
252203
IF(MSVC_VERSION GREATER 1310)
253204
SET(HAVE_STRNLEN 1 CACHE INTERNAL "")
254205
ENDIF()
255206
SET(HAVE_STRPBRK 1 CACHE INTERNAL "")
256-
SET(HAVE_STRSEP CACHE INTERNAL "")
257-
SET(HAVE_STRSIGNAL CACHE INTERNAL "")
258-
SET(HAVE_STRSTR 1 CACHE INTERNAL "")
259207
SET(HAVE_STRTOK_R CACHE INTERNAL "")
260-
SET(HAVE_STRTOL 1 CACHE INTERNAL "")
261208
SET(HAVE_STRTOLL CACHE INTERNAL "")
262209
SET(HAVE_STRTOUL 1 CACHE INTERNAL "")
263210
SET(HAVE_STRTOULL CACHE INTERNAL "")
264-
SET(HAVE_SVR3_SIGNALS CACHE INTERNAL "")
265211
SET(HAVE_SYNCH_H CACHE INTERNAL "")
266212
SET(HAVE_SYSENT_H CACHE INTERNAL "")
267-
SET(HAVE_SYS_CDEFS_H CACHE INTERNAL "")
268213
SET(HAVE_SYS_DIR_H CACHE INTERNAL "")
269214
SET(HAVE_SYS_EVENT_H CACHE INTERNAL "")
270215
SET(HAVE_SYS_ERRLIST CACHE INTERNAL "")
@@ -285,7 +230,6 @@ SET(HAVE_SYS_SOCKIO_H CACHE INTERNAL "")
285230
SET(HAVE_SYS_SOCKET_H CACHE INTERNAL "")
286231
SET(HAVE_SYS_STAT_H 1 CACHE INTERNAL "")
287232
SET(HAVE_SYS_STREAM_H CACHE INTERNAL "")
288-
SET(HAVE_SYS_TERMCAP_H CACHE INTERNAL "")
289233
SET(HAVE_SYS_TIMEB_H 1 CACHE INTERNAL "")
290234
SET(HAVE_SYS_TIMES_H CACHE INTERNAL "")
291235
SET(HAVE_SYS_TIME_H CACHE INTERNAL "")
@@ -310,10 +254,8 @@ SET(HAVE_TIME_H 1 CACHE INTERNAL "")
310254
SET(HAVE_TZNAME 1 CACHE INTERNAL "")
311255
SET(HAVE_UNISTD_H CACHE INTERNAL "")
312256
SET(HAVE_UTIME_H CACHE INTERNAL "")
313-
SET(HAVE_VALLOC CACHE INTERNAL "")
314257
SET(HAVE_VARARGS_H 1 CACHE INTERNAL "")
315258
SET(HAVE_VASPRINTF CACHE INTERNAL "")
316-
SET(HAVE_VPRINTF 1 CACHE INTERNAL "")
317259
IF(MSVC_VERSION GREATER 1310)
318260
SET(HAVE_VSNPRINTF 1 CACHE INTERNAL "")
319261
ENDIF()
@@ -334,9 +276,6 @@ IF(MSVC_VERSION GREATER 1310)
334276
SET(HAVE_strtok_s 1 CACHE INTERNAL "")
335277
ENDIF()
336278
SET(STDC_HEADERS CACHE 1 INTERNAL "")
337-
SET(STRUCT_DIRENT_HAS_D_INO CACHE INTERNAL "")
338-
SET(STRUCT_DIRENT_HAS_D_INO CACHE INTERNAL "")
339-
SET(STRUCT_DIRENT_HAS_D_NAMLEN CACHE INTERNAL "")
340279
SET(TIME_WITH_SYS_TIME CACHE INTERNAL "")
341280
SET(TIME_T_UNSIGNED 1 CACHE INTERNAL "")
342281
SET(TIOCSTAT_IN_SYS_IOCTL CACHE INTERNAL "")
@@ -354,18 +293,16 @@ SET(HAVE_SYS_NDIR_H CACHE INTERNAL "")
354293
SET(HAVE_SYS_NDIR_H CACHE INTERNAL "")
355294
SET(HAVE_ASM_TERMBITS_H CACHE INTERNAL "")
356295
SET(HAVE_TERMBITS_H CACHE INTERNAL "")
357-
SET(HAVE_VIS_H CACHE INTERNAL "")
358296
SET(HAVE_WCHAR_H 1 CACHE INTERNAL "")
359297
SET(HAVE_WCTYPE_H 1 CACHE INTERNAL "")
360298
SET(HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP CACHE INTERNAL "")
361299
SET(HAVE_SOCKADDR_IN_SIN_LEN CACHE INTERNAL "")
362300
SET(HAVE_SOCKADDR_IN6_SIN6_LEN CACHE INTERNAL "")
363-
SET(HAVE_VALGRIND CACHE INTERNAL "")
301+
SET(HAVE_VALGRIND_MEMCHECK_H CACHE INTERNAL "")
364302
SET(HAVE_EVENT_H CACHE INTERNAL "")
365303
SET(HAVE_LINUX_UNISTD_H CACHE INTERNAL "")
366304
SET(HAVE_SYS_UTSNAME_H CACHE INTERNAL "")
367305
SET(HAVE_PTHREAD_ATTR_GETGUARDSIZE CACHE INTERNAL "")
368-
SET(HAVE_UCONTEXT_H CACHE INTERNAL "")
369306
SET(HAVE_SOCKPEERCRED CACHE INTERNAL "")
370307
SET(HAVE_ABI_CXA_DEMANGLE CACHE INTERNAL "")
371308
SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "")

cmake/readline.cmake

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,11 @@ MACRO (MYSQL_CHECK_MULTIBYTE)
2727
SET(HAVE_MBSTATE_T 1)
2828
ENDIF()
2929
ENDIF()
30-
31-
CHECK_C_SOURCE_COMPILES("
32-
#include <langinfo.h>
33-
int main(int ac, char **av)
34-
{
35-
char *cs = nl_langinfo(CODESET);
36-
return 0;
37-
}"
38-
HAVE_LANGINFO_CODESET)
3930

4031
CHECK_FUNCTION_EXISTS(mbrlen HAVE_MBRLEN)
41-
CHECK_FUNCTION_EXISTS(mbscmp HAVE_MBSCMP)
4232
CHECK_FUNCTION_EXISTS(mbsrtowcs HAVE_MBSRTOWCS)
43-
CHECK_FUNCTION_EXISTS(wcrtomb HAVE_WCRTOMB)
4433
CHECK_FUNCTION_EXISTS(mbrtowc HAVE_MBRTOWC)
45-
CHECK_FUNCTION_EXISTS(wcscoll HAVE_WCSCOLL)
46-
CHECK_FUNCTION_EXISTS(wcsdup HAVE_WCSDUP)
4734
CHECK_FUNCTION_EXISTS(wcwidth HAVE_WCWIDTH)
48-
CHECK_FUNCTION_EXISTS(wctype HAVE_WCTYPE)
4935
CHECK_FUNCTION_EXISTS(iswlower HAVE_ISWLOWER)
5036
CHECK_FUNCTION_EXISTS(iswupper HAVE_ISWUPPER)
5137
CHECK_FUNCTION_EXISTS(towlower HAVE_TOWLOWER)
@@ -60,13 +46,7 @@ MACRO (MYSQL_CHECK_MULTIBYTE)
6046

6147
SET(CMAKE_EXTRA_INCLUDE_FILES wctype.h)
6248
CHECK_TYPE_SIZE(wctype_t SIZEOF_WCTYPE_T)
63-
IF(SIZEOF_WCTYPE_T)
64-
SET(HAVE_WCTYPE_T 1)
65-
ENDIF()
6649
CHECK_TYPE_SIZE(wint_t SIZEOF_WINT_T)
67-
IF(SIZEOF_WINT_T)
68-
SET(HAVE_WINT_T 1)
69-
ENDIF()
7050
SET(CMAKE_EXTRA_INCLUDE_FILES)
7151

7252
ENDMACRO()
@@ -87,15 +67,12 @@ MACRO (FIND_CURSES)
8767

8868
IF(CURSES_HAVE_CURSES_H)
8969
SET(HAVE_CURSES_H 1 CACHE INTERNAL "")
90-
ELSEIF(CURSES_HAVE_NCURSES_H)
91-
SET(HAVE_NCURSES_H 1 CACHE INTERNAL "")
9270
ENDIF()
9371
IF(CMAKE_SYSTEM_NAME MATCHES "HP")
9472
# CMake uses full path to library /lib/libcurses.sl
9573
# On Itanium, it results into architecture mismatch+
9674
# the library is for PA-RISC
9775
SET(CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
98-
SET(CURSES_CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
9976
ENDIF()
10077

10178
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")

0 commit comments

Comments
 (0)