[mojosetup] CMake curses stuff [diff attached]
Gary Briggs
chunky at icculus.org
Sat Feb 27 22:46:47 EST 2010
On Sat, Feb 27, 2010 at 08:52:03PM -0500, Ryan C. Gordon wrote:
>
> >Anyways. Please find attached a diff to make it build using FindCurses,
> >which causes it to successfully build on this machine now.
>
> Can you confirm this still links against cursesw (the unicode version of
> curses)? I think that was the issue I had before.
Ah... that, it doesn't.
http://www.mail-archive.com/cmake@cmake.org/msg15578.html
So I patched FindCurses.cmake and put it into a cmakemodules subdir of
mojosetup, and moved the path appropriately.
And suddenly I correctly get mojosetup linked against libncursesw:
chunky at mills:~/src/mojosetup/build$ ldd mojosetup
linux-vdso.so.1 => (0x00007fffa2951000)
libncursesw.so.5 => /lib/libncursesw.so.5 (0x00007fb239f2e000)
libformw.so.5 => /usr/lib/libformw.so.5 (0x00007fb239d1e000)
libpthread.so.0 => /lib/libpthread.so.0 (0x00007fb239b02000)
libz.so.1 => /lib/libz.so.1 (0x00007fb2398ea000)
libdl.so.2 => /lib/libdl.so.2 (0x00007fb2396e6000)
libm.so.6 => /lib/libm.so.6 (0x00007fb239461000)
libc.so.6 => /lib/libc.so.6 (0x00007fb2390ef000)
/lib64/ld-linux-x86-64.so.2 (0x00007fb23a177000)
chunky at mills:~/src/mojosetup/build$
The downside is that it required a separate cmake module that I override
the system-wide one with. If/When this makes it into upstream, it should
be removed.
I alst noticed that you do actually require ncursesw and not just
cursesw. There's a parameter to [even the base] FindCurses to say that,
so I've added that. I also suppressed the developer warning about
escaping stuff. I've been suppressing that in my own projects for a
while and had no bad side effects.
Please find attached a new version that links against ncursesw. I guess
the real downside is that I've just put in a really huge amount of
effort to stop from hardcoding a single "-lncursesw" in the CMakeLists.
Gary (-;
-------------- next part --------------
diff -r d4251dabe79a CMakeLists.txt
--- a/CMakeLists.txt Tue Feb 16 14:05:06 2010 -0500
+++ b/CMakeLists.txt Wed Feb 24 23:17:22 2010 -0800
@@ -39,6 +39,8 @@
SET(MOJOSETUP_VERSION "???")
ENDIF(HGVERSION_RC)
+# Search our own cmakemodules first.
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmakemodules")
# I hate that they define "WIN32" ... we're about to move to Win64...I hope!
IF(WIN32 AND NOT WINDOWS)
@@ -65,6 +67,12 @@
INCLUDE(CheckCCompilerFlag)
INCLUDE(TestBigEndian)
+IF(COMMAND CMAKE_POLICY)
+# Use old policy when it comes to escaping macros
+# Specifically the one in quotes below
+ CMAKE_POLICY(SET CMP0005 OLD)
+ENDIF(COMMAND CMAKE_POLICY)
+
ADD_DEFINITIONS(-D__MOJOSETUP__=1)
ADD_DEFINITIONS(-DAPPID=mojosetup)
ADD_DEFINITIONS(-DAPPREV="${MOJOSETUP_VERSION}")
@@ -374,27 +382,40 @@
ENDIF(MOJOSETUP_GUI_STDIO)
# BINARY SIZE += !!! FIXME: check this.
-IF(UNIX) # !!! FIXME: use FindCurses instead...
+SET(CURSES_NEED_WIDE TRUE)
+SET(CURSES_NEED_NCURSES TRUE)
+FIND_PACKAGE(Curses)
+IF(CURSES_FOUND)
IF(NOT BEOS)
IF(NOT MACOSX)
IF(NOT SOLARIS) # !!! FIXME: Solaris's curses is really broken, or I'm using it wrong.
OPTION(MOJOSETUP_GUI_NCURSES "Enable ncurses GUI" TRUE)
IF(MOJOSETUP_GUI_NCURSES)
ADD_DEFINITIONS(-DSUPPORT_GUI_NCURSES=1)
+ INCLUDE_DIRECTORIES(CURSES_INCLUDE_DIR)
+
+ IF(CURSES_HAVE_NCURSESW_NCURSES_H)
+ ADD_DEFINITIONS(-DHAVE_NCURSESW_NCURSES_H)
+ ELSEIF(CURSES_HAVE_NCURSESW_CURSES_H)
+ ADD_DEFINITIONS(-DHAVE_NCURSESW_CURSES_H)
+ ELSEIF(CURSES_HAVE_NCURSESW_H)
+ ADD_DEFINITIONS(-DHAVE_NCURSESW_H)
+ ENDIF(CURSES_HAVE_NCURSESW_NCURSES_H)
+
OPTION(MOJOSETUP_GUI_NCURSES_STATIC "Statically link ncurses GUI" FALSE)
IF(MOJOSETUP_GUI_NCURSES_STATIC)
ADD_DEFINITIONS(-DGUI_STATIC_LINK_NCURSES=1)
SET(OPTIONAL_SRCS ${OPTIONAL_SRCS} gui_ncurses.c)
- SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} -lncursesw) # !!! FIXME
+ SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${CURSES_LIBRARIES})
ELSE(MOJOSETUP_GUI_NCURSES_STATIC)
MOJOSETUP_ADD_LIBRARY(mojosetupgui_ncurses gui_ncurses.c)
- TARGET_LINK_LIBRARIES(mojosetupgui_ncurses "-lncursesw") # !!! FIXME
+ TARGET_LINK_LIBRARIES(mojosetupgui_ncurses ${CURSES_LIBRARIES})
ENDIF(MOJOSETUP_GUI_NCURSES_STATIC)
ENDIF(MOJOSETUP_GUI_NCURSES)
ENDIF(NOT SOLARIS)
ENDIF(NOT MACOSX)
ENDIF(NOT BEOS)
-ENDIF(UNIX)
+ENDIF(CURSES_FOUND)
IF(MACOSX)
OPTION(MOJOSETUP_GUI_COCOA "Enable Cocoa GUI" TRUE)
diff -r d4251dabe79a cmakemodules/FindCurses.cmake
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/cmakemodules/FindCurses.cmake Wed Feb 24 23:17:22 2010 -0800
@@ -0,0 +1,179 @@
+# - Find the curses include file and library
+#
+# CURSES_FOUND - system has Curses
+# CURSES_INCLUDE_DIR - the Curses include directory
+# CURSES_LIBRARIES - The libraries needed to use Curses
+# CURSES_HAVE_CURSES_H - true if curses.h is available
+# CURSES_HAVE_NCURSES_H - true if ncurses.h is available
+# CURSES_HAVE_NCURSES_NCURSES_H - true if ncurses/ncurses.h is available
+# CURSES_HAVE_NCURSES_CURSES_H - true if ncurses/curses.h is available
+# CURSES_LIBRARY - set for backwards compatibility with 2.4 CMake
+#
+# Set CURSES_NEED_NCURSES to TRUE before the FIND_PACKAGE() command if NCurses
+# functionality is required.
+
+# Set CURSES_NEED_WIDE to TRUE before the FIND_PACKAGE() command if unicode
+# functionality is required
+
+SET(CURSES_LIBRARY_NAME "curses")
+SET(NCURSES_LIBRARY_NAME "ncurses")
+IF(CURSES_NEED_WIDE)
+ SET(CURSES_LIBRARY_NAME "cursesw")
+ SET(NCURSES_LIBRARY_NAME "ncursesw")
+ENDIF(CURSES_NEED_WIDE)
+
+FIND_LIBRARY(CURSES_CURSES_LIBRARY "${CURSES_LIBRARY_NAME}")
+# MESSAGE(STATUS "CURSES! " ${CURSES_CURSES_LIBRARY})
+
+FIND_LIBRARY(CURSES_NCURSES_LIBRARY "${NCURSES_LIBRARY_NAME}")
+# MESSAGE(STATUS "NCURSES! " ${CURSES_NCURSES_LIBRARY})
+
+SET(CURSES_USE_NCURSES FALSE)
+
+IF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_LIBRARY)
+ SET(CURSES_USE_NCURSES TRUE)
+ENDIF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_LIBRARY)
+
+
+# Not sure the logic is correct here.
+# If NCurses is required, use the function wsyncup() to check if the library
+# has NCurses functionality (at least this is where it breaks on NetBSD).
+# If wsyncup is in curses, use this one.
+# If not, try to find ncurses and check if this has the symbol.
+# Once the ncurses library is found, search the ncurses.h header first, but
+# some web pages also say that even with ncurses there is not always a ncurses.h:
+# http://osdir.com/ml/gnome.apps.mc.devel/2002-06/msg00029.html
+# So at first try ncurses.h, if not found, try to find curses.h under the same
+# prefix as the library was found, if still not found, try curses.h with the
+# default search paths.
+IF(CURSES_CURSES_LIBRARY AND CURSES_NEED_NCURSES)
+ INCLUDE(CheckLibraryExists)
+ CHECK_LIBRARY_EXISTS("${CURSES_CURSES_LIBRARY}"
+ wsyncup "" CURSES_CURSES_HAS_WSYNCUP)
+
+ IF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_HAS_WSYNCUP)
+ CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}"
+ wsyncup "" CURSES_NCURSES_HAS_WSYNCUP)
+ IF( CURSES_NCURSES_HAS_WSYNCUP)
+ SET(CURSES_USE_NCURSES TRUE)
+ ENDIF( CURSES_NCURSES_HAS_WSYNCUP)
+ ENDIF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_HAS_WSYNCUP)
+
+ENDIF(CURSES_CURSES_LIBRARY AND CURSES_NEED_NCURSES)
+
+
+IF(NOT CURSES_USE_NCURSES)
+ FIND_FILE(CURSES_HAVE_CURSES_H curses.h )
+ FIND_FILE(CURSES_HAVE_CURSESW_H cursesw.h )
+ FIND_PATH(CURSES_CURSES_H_PATH curses.h )
+ FIND_PATH(CURSES_CURSESW_H_PATH cursesw.h )
+ GET_FILENAME_COMPONENT(_cursesLibDir "${CURSES_CURSES_LIBRARY}" PATH)
+ GET_FILENAME_COMPONENT(_cursesParentDir "${_cursesLibDir}" PATH)
+
+ # for compatibility with older FindCurses.cmake this has to be in the cache
+ # FORCE must not be used since this would break builds which preload a cache wqith these variables set
+ SET(CURSES_INCLUDE_PATH "${CURSES_CURSES_H_PATH} ${CURSES_CURSESW_H_PATH}"
+ CACHE FILEPATH "The curses include path")
+ SET(CURSES_LIBRARY "${CURSES_CURSES_LIBRARY}"
+ CACHE FILEPATH "The curses library")
+ELSE(NOT CURSES_USE_NCURSES)
+# we need to find ncurses
+ GET_FILENAME_COMPONENT(_cursesLibDir "${CURSES_NCURSES_LIBRARY}" PATH)
+ GET_FILENAME_COMPONENT(_cursesParentDir "${_cursesLibDir}" PATH)
+
+ FIND_FILE(CURSES_HAVE_NCURSES_H ncurses.h)
+ FIND_FILE(CURSES_HAVE_NCURSES_NCURSES_H ncurses/ncurses.h)
+ FIND_FILE(CURSES_HAVE_NCURSES_CURSES_H ncurses/curses.h)
+ FIND_FILE(CURSES_HAVE_CURSES_H curses.h
+ HINTS "${_cursesParentDir}/include")
+
+ FIND_FILE(CURSES_HAVE_NCURSESW_H ncursesw.h)
+ FIND_FILE(CURSES_HAVE_NCURSESW_NCURSES_H ncursesw/ncurses.h)
+ FIND_FILE(CURSES_HAVE_NCURSESW_CURSES_H ncursesw/curses.h)
+ FIND_FILE(CURSES_HAVE_CURSESW_H cursesw.h
+ HINTS "${_cursesParentDir}/include")
+
+ FIND_PATH(CURSES_NCURSES_INCLUDE_PATH ncurses.h ncurses/ncurses.h
+ ncurses/curses.h ncursesw.h ncursesw/ncurses.h ncursesw/curses.h cursesw.h)
+ FIND_PATH(CURSES_NCURSES_INCLUDE_PATH curses.h
+ HINTS "${_cursesParentDir}/include")
+
+ # for compatibility with older FindCurses.cmake this has to be in the cache
+ # FORCE must not be used since this would break builds which preload
+ # a cache wqith these variables set
+ # only put ncurses include and library into
+ # variables if they are found
+ IF(CURSES_NCURSES_INCLUDE_PATH AND CURSES_NCURSES_LIBRARY)
+
+ SET(CURSES_INCLUDE_PATH "${CURSES_NCURSES_INCLUDE_PATH} ${CURSES_NCURSESW_INCLUDE_PATH}"
+ CACHE FILEPATH "The curses include path")
+ SET(CURSES_LIBRARY "${CURSES_NCURSES_LIBRARY}"
+ CACHE FILEPATH "The curses library")
+ ENDIF(CURSES_NCURSES_INCLUDE_PATH AND CURSES_NCURSES_LIBRARY)
+
+ENDIF(NOT CURSES_USE_NCURSES)
+
+
+
+FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
+FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr )
+
+SET(CURSES_FORM_LIBRARY_NAME "form")
+IF(CURSES_NEED_WIDE)
+ SET(CURSES_FORM_LIBRARY_NAME "formw")
+ENDIF(CURSES_NEED_WIDE)
+
+FIND_LIBRARY(CURSES_CURSES_LIBRARY "${CURSES_LIBRARY_NAME}")
+FIND_LIBRARY(CURSES_FORM_LIBRARY "${CURSES_FORM_LIBRARY_NAME}" HINTS "${_cursesLibDir}")
+FIND_LIBRARY(CURSES_FORM_LIBRARY "${CURSES_FORM_LIBRARY_NAME}" )
+
+# for compatibility with older FindCurses.cmake this has to be in the cache
+# FORCE must not be used since this would break builds which preload a cache
+# qith these variables set
+SET(FORM_LIBRARY "${CURSES_FORM_LIBRARY}"
+ CACHE FILEPATH "The curses form library")
+
+# Need to provide the *_LIBRARIES
+SET(CURSES_LIBRARIES ${CURSES_LIBRARY})
+
+IF(CURSES_EXTRA_LIBRARY)
+ SET(CURSES_LIBRARIES ${CURSES_LIBRARIES} ${CURSES_EXTRA_LIBRARY})
+ENDIF(CURSES_EXTRA_LIBRARY)
+
+IF(CURSES_FORM_LIBRARY)
+ SET(CURSES_LIBRARIES ${CURSES_LIBRARIES} ${CURSES_FORM_LIBRARY})
+ENDIF(CURSES_FORM_LIBRARY)
+
+# Proper name is *_INCLUDE_DIR
+SET(CURSES_INCLUDE_DIR ${CURSES_INCLUDE_PATH})
+
+# handle the QUIETLY and REQUIRED arguments and set CURSES_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Curses DEFAULT_MSG
+ CURSES_LIBRARY CURSES_INCLUDE_PATH)
+
+MARK_AS_ADVANCED(
+ CURSES_INCLUDE_PATH
+ CURSES_LIBRARY
+ CURSES_CURSES_INCLUDE_PATH
+ CURSES_CURSES_LIBRARY
+ CURSES_NCURSES_INCLUDE_PATH
+ CURSES_NCURSES_LIBRARY
+ CURSES_EXTRA_LIBRARY
+ FORM_LIBRARY
+ CURSES_FORM_LIBRARY
+ CURSES_LIBRARIES
+ CURSES_INCLUDE_DIR
+ CURSES_CURSES_HAS_WSYNCUP
+ CURSES_NCURSES_HAS_WSYNCUP
+ CURSES_HAVE_CURSESW_H
+ CURSES_HAVE_CURSES_H
+ CURSES_HAVE_NCURSESW_CURSES_H
+ CURSES_HAVE_NCURSESW_H
+ CURSES_HAVE_NCURSESW_NCURSES_H
+ CURSES_HAVE_NCURSES_CURSES_H
+ CURSES_HAVE_NCURSES_H
+ CURSES_HAVE_NCURSES_NCURSES_H
+ )
+
diff -r d4251dabe79a gui_ncurses.c
--- a/gui_ncurses.c Tue Feb 16 14:05:06 2010 -0500
+++ b/gui_ncurses.c Wed Feb 24 23:17:22 2010 -0800
@@ -21,7 +21,17 @@
#include <unistd.h>
#include <ctype.h>
+// CMake searches for a whole bunch of different possible curses includes
+#if defined(HAVE_NCURSESW_NCURSES_H)
+#include <ncursesw/ncurses.h>
+#elif defined(HAVE_NCURSESW_CURSES_H)
#include <ncursesw/curses.h>
+#elif defined(HAVE_NCURSESW_H)
+#include <ncursesw.h>
+#else
+#error ncurses gui enabled, but no known header file found
+#endif
+
#include <locale.h>
// This was built to look roughly like dialog(1), but it's not nearly as
More information about the mojosetup
mailing list