diff --git a/CMake/Modules/FindCurses.cmake b/CMake/Modules/FindCurses.cmake index 3107d758e..468eff8e2 100644 --- a/CMake/Modules/FindCurses.cmake +++ b/CMake/Modules/FindCurses.cmake @@ -23,10 +23,10 @@ IF(CURSES_NEED_WIDE) ENDIF(CURSES_NEED_WIDE) FIND_LIBRARY(CURSES_CURSES_LIBRARY "${CURSES_LIBRARY_NAME}") -# MESSAGE(STATUS "CURSES! " ${CURSES_CURSES_LIBRARY}) +#MESSAGE(STATUS "CURSES! " ${CURSES_CURSES_LIBRARY}) FIND_LIBRARY(CURSES_NCURSES_LIBRARY "${NCURSES_LIBRARY_NAME}") -# MESSAGE(STATUS "NCURSES! " ${CURSES_NCURSES_LIBRARY}) +#MESSAGE(STATUS "NCURSES! " ${CURSES_NCURSES_LIBRARY}) SET(CURSES_USE_NCURSES FALSE) @@ -58,7 +58,6 @@ IF(CURSES_CURSES_LIBRARY AND CURSES_NEED_NCURSES) 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) @@ -104,7 +103,6 @@ ELSE(NOT CURSES_USE_NCURSES) # 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}" diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index f91f3ee15..8785ff893 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -58,9 +58,9 @@ TARGET_LINK_LIBRARIES(dfvecc dfhack) IF(UNIX) SET(CURSES_NEED_WIDE "YES") - SET(CURSES_USE_NCURSES "YES") - + SET(CURSES_NEED_NCURSES "YES") find_package(Curses) + IF(CURSES_FOUND) if(CURSES_HAVE_NCURSESW_NCURSES_H) SET(NCURSES_H "ncursesw/ncurses.h") @@ -70,7 +70,7 @@ IF(UNIX) SET(NCURSES_H "ncursesw.h") elseif(CURSES_HAVE_CURSESW_H) SET(NCURSES_H "cursesw.h") - endif(CURSES_HAVE_NCURSESW_H) + endif(CURSES_HAVE_NCURSESW_NCURSES_H) IF(NCURSES_H) # OPTION( VARIABLE "Description" Initial state) #OPTION( WITH_FOO "Enable FOO support" ON ) @@ -82,7 +82,13 @@ IF(UNIX) ADD_EXECUTABLE(dfveinlook veinlook.cpp) INCLUDE_DIRECTORIES(${CURSES_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(dfveinlook dfhack ${CURSES_LIBRARIES}) + install(TARGETS + dfveinlook + RUNTIME DESTINATION bin + ) ENDIF(NCURSES_H) + ELSE(CURSES_FOUND) + MESSAGE(STATUS "Wide-character ncurses library not found - vainlook can't be built") ENDIF(CURSES_FOUND) ENDIF(UNIX) @@ -101,7 +107,6 @@ dfmaterialtest dfposition dfrenamer dfsuspend -dfveinlook RUNTIME DESTINATION bin ) ENDIF(UNIX)