From eb915bd054cc5d457fceb5899c24b95119497779 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 8 Jun 2014 17:51:42 -0400 Subject: [PATCH] Build - Basic tasksh builds. --- cmake/Modules/FindReadline.cmake | 81 ++++++++++++++++++++++++++++++++ doc/CMakeLists.txt | 2 +- src/main.cpp | 2 - 3 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 cmake/Modules/FindReadline.cmake diff --git a/cmake/Modules/FindReadline.cmake b/cmake/Modules/FindReadline.cmake new file mode 100644 index 0000000..8fdaec1 --- /dev/null +++ b/cmake/Modules/FindReadline.cmake @@ -0,0 +1,81 @@ +# - Find the readline library +# This module defines +# READLINE_INCLUDE_DIR, path to readline/readline.h, etc. +# READLINE_LIBRARIES, the libraries required to use READLINE. +# READLINE_FOUND, If false, do not try to use READLINE. +# also defined, but not for general use are +# READLINE_readline_LIBRARY, where to find the READLINE library. +# READLINE_ncurses_LIBRARY, where to find the ncurses library [might not be defined] + +# Apple readline does not support readline hooks +# So we look for another one by default +IF (APPLE OR FREEBSD) + FIND_PATH (READLINE_INCLUDE_DIR NAMES readline/readline.h PATHS + /usr/include/ + /sw/include + /opt/local/include + /opt/include + /usr/local/include + NO_DEFAULT_PATH + ) +ENDIF (APPLE OR FREEBSD) +FIND_PATH (READLINE_INCLUDE_DIR NAMES readline/readline.h) + + +# Apple readline does not support readline hooks +# So we look for another one by default +IF (APPLE OR FREEBSD) + FIND_LIBRARY (READLINE_readline_LIBRARY NAMES readline PATHS + /usr/lib + /sw/lib + /opt/local/lib + /opt/lib + /usr/local/lib + NO_DEFAULT_PATH + ) +ENDIF (APPLE OR FREEBSD) +FIND_LIBRARY (READLINE_readline_LIBRARY NAMES readline) + +# Sometimes readline really needs ncurses +IF (APPLE OR FREEBSD) + FIND_LIBRARY (READLINE_ncurses_LIBRARY NAMES ncurses PATHS + /usr/lib + /sw/lib + /opt/local/lib + /opt/lib + /usr/local/lib + /usr/lib + NO_DEFAULT_PATH + ) +ENDIF (APPLE OR FREEBSD) +FIND_LIBRARY (READLINE_ncurses_LIBRARY NAMES ncurses) + +MARK_AS_ADVANCED ( + READLINE_INCLUDE_DIR + READLINE_readline_LIBRARY + READLINE_ncurses_LIBRARY + ) + +SET (READLINE_FOUND "NO" ) +IF (READLINE_INCLUDE_DIR) + IF (READLINE_readline_LIBRARY) + SET (READLINE_FOUND "YES" ) + SET (READLINE_LIBRARIES + ${READLINE_readline_LIBRARY} + ) + + # some readline libraries depend on ncurses + IF (READLINE_ncurses_LIBRARY) + SET (READLINE_LIBRARIES ${READLINE_LIBRARIES} ${READLINE_ncurses_LIBRARY}) + ENDIF (READLINE_ncurses_LIBRARY) + + ENDIF (READLINE_readline_LIBRARY) +ENDIF (READLINE_INCLUDE_DIR) + +IF (READLINE_FOUND) + MESSAGE (STATUS "Found readline library") +ELSE (READLINE_FOUND) + IF (READLINE_FIND_REQUIRED) + MESSAGE (FATAL_ERROR "Could not find readline -- please give some paths to CMake") + ENDIF (READLINE_FIND_REQUIRED) +ENDIF (READLINE_FOUND) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 3838b9c..180543d 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -7,6 +7,6 @@ foreach (man_FILE ${man_FILES}) man/${man_FILE}) endforeach (man_FILE) -install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/ DESTINATION ${TASK_MAN1DIR} +install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/ DESTINATION ${TASKSH_MAN1DIR} FILES_MATCHING PATTERN "*.1") diff --git a/src/main.cpp b/src/main.cpp index a7f1bb2..23b5dd2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,8 +28,6 @@ #include #include -Context context; - //////////////////////////////////////////////////////////////////////////////// int main (int argc, const char** argv) {