Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
890ef94c
Commit
890ef94c
authored
Dec 20, 2009
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
ea35ac81
728c437a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
cmake/readline.cmake
cmake/readline.cmake
+13
-1
cmd-line-utils/libedit/CMakeLists.txt
cmd-line-utils/libedit/CMakeLists.txt
+1
-1
No files found.
cmake/readline.cmake
View file @
890ef94c
...
@@ -79,7 +79,7 @@ MACRO (MYSQL_CHECK_MULTIBYTE)
...
@@ -79,7 +79,7 @@ MACRO (MYSQL_CHECK_MULTIBYTE)
ENDMACRO
()
ENDMACRO
()
MACRO
(
FIND_CURSES
)
MACRO
(
FIND_CURSES
)
INCLUDE
(
FindCurses
)
FIND_PACKAGE
(
Curses
)
MARK_AS_ADVANCED
(
CURSES_CURSES_H_PATH CURSES_FORM_LIBRARY CURSES_HAVE_CURSES_H
)
MARK_AS_ADVANCED
(
CURSES_CURSES_H_PATH CURSES_FORM_LIBRARY CURSES_HAVE_CURSES_H
)
IF
(
NOT CURSES_FOUND
)
IF
(
NOT CURSES_FOUND
)
SET
(
ERRORMSG
"Curses library not found. Please install appropriate package,
SET
(
ERRORMSG
"Curses library not found. Please install appropriate package,
...
@@ -104,6 +104,18 @@ MACRO (FIND_CURSES)
...
@@ -104,6 +104,18 @@ MACRO (FIND_CURSES)
SET
(
CURSES_LIBRARY
"curses"
CACHE INTERNAL
""
FORCE
)
SET
(
CURSES_LIBRARY
"curses"
CACHE INTERNAL
""
FORCE
)
SET
(
CURSES_CURSES_LIBRARY
"curses"
CACHE INTERNAL
""
FORCE
)
SET
(
CURSES_CURSES_LIBRARY
"curses"
CACHE INTERNAL
""
FORCE
)
ENDIF
()
ENDIF
()
IF
(
CMAKE_SYSTEM_NAME MATCHES
"Linux"
)
# -Wl,--as-needed breaks linking with -lcurses, e.g on Fedora
# Lower-level libcurses calls are exposed by libtinfo
CHECK_LIBRARY_EXISTS
(
${
CURSES_LIBRARY
}
tputs
""
HAVE_TPUTS_IN_CURSES
)
IF
(
NOT HAVE_TPUTS_IN_CURSES
)
CHECK_LIBRARY_EXISTS
(
tinfo tputs
""
HAVE_TPUTS_IN_TINFO
)
IF
(
HAVE_TPUTS_IN_TINFO
)
SET
(
CURSES_LIBRARY tinfo
)
ENDIF
()
ENDIF
()
ENDIF
()
ENDMACRO
()
ENDMACRO
()
MACRO
(
MYSQL_USE_BUNDLED_READLINE
)
MACRO
(
MYSQL_USE_BUNDLED_READLINE
)
...
...
cmd-line-utils/libedit/CMakeLists.txt
View file @
890ef94c
...
@@ -18,7 +18,7 @@ INCLUDE(CheckIncludeFile)
...
@@ -18,7 +18,7 @@ INCLUDE(CheckIncludeFile)
include
(
CheckFunctionExists
)
include
(
CheckFunctionExists
)
CHECK_INCLUDE_FILES
(
term.h HAVE_TERM_H
)
CHECK_INCLUDE_FILES
(
term.h HAVE_TERM_H
)
SET
(
CMAKE_REQUIRED_LIBRARIES
${
CURSES_
CURSES_
LIBRARY
}
)
SET
(
CMAKE_REQUIRED_LIBRARIES
${
CURSES_LIBRARY
}
)
CHECK_CXX_SOURCE_COMPILES
(
"
CHECK_CXX_SOURCE_COMPILES
(
"
#include <term.h>
#include <term.h>
int main()
int main()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment