From b22e2de8e5e9c8ccb27ed74c5b6b1cd93b9b8a46 Mon Sep 17 00:00:00 2001 From: Berk Geveci Date: Mon, 5 Nov 2001 13:24:44 -0500 Subject: HPUX support. --- Modules/FindCurses.cmake | 12 ++++++++---- Source/CursesDialog/CMakeLists.txt | 5 +++++ Source/CursesDialog/cmCursesForm.h | 3 +-- Source/CursesDialog/cmCursesLabelWidget.h | 3 +-- Source/CursesDialog/cmCursesMainForm.h | 3 +-- Source/CursesDialog/cmCursesStandardIncludes.h | 7 +++++++ Source/CursesDialog/cmCursesWidget.h | 3 +-- Source/CursesDialog/form/frm_driver.c | 3 +++ Source/CursesDialog/form/frm_req_name.c | 3 +++ 9 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 Source/CursesDialog/cmCursesStandardIncludes.h diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake index 929eef1..44c616c 100644 --- a/Modules/FindCurses.cmake +++ b/Modules/FindCurses.cmake @@ -3,14 +3,18 @@ # FIND_PATH(CURSES_INCLUDE_PATH curses.h -/usr/local/include -/usr/include +/usr/local/include /usr/include ) FIND_LIBRARY(CURSES_LIBRARY curses -PATHS /usr/lib /usr/local/lib +PATHS /usr/local/lib /usr/lib +) + +FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr +PATHS /usr/local/lib /usr/lib ) FIND_LIBRARY(FORM_LIBRARY form -PATHS /usr/lib /usr/local/lib +PATHS /usr/local/lib /usr/lib ) + diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt index d0dad7c..336b64f 100644 --- a/Source/CursesDialog/CMakeLists.txt +++ b/Source/CursesDialog/CMakeLists.txt @@ -17,6 +17,11 @@ SOURCE_FILES( CURSES_SRCS INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH}) INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form/) LINK_LIBRARIES(${CURSES_LIBRARY}) + +IF(CURSES_EXTRA_LIBRARY) + LINK_LIBRARIES(${CURSES_EXTRA_LIBRARY}) +ENDIF(CURSES_EXTRA_LIBRARY) + LINK_LIBRARIES(cmForm) ADD_EXECUTABLE(ccurses CURSES_SRCS) \ No newline at end of file diff --git a/Source/CursesDialog/cmCursesForm.h b/Source/CursesDialog/cmCursesForm.h index 4924f2e..bf6d065 100644 --- a/Source/CursesDialog/cmCursesForm.h +++ b/Source/CursesDialog/cmCursesForm.h @@ -1,8 +1,7 @@ #ifndef __cmCursesForm_h #define __cmCursesForm_h -#include -#include +#include "cmCursesStandardIncludes.h" class cmCursesForm { diff --git a/Source/CursesDialog/cmCursesLabelWidget.h b/Source/CursesDialog/cmCursesLabelWidget.h index 6d3a7cf..93442d2 100644 --- a/Source/CursesDialog/cmCursesLabelWidget.h +++ b/Source/CursesDialog/cmCursesLabelWidget.h @@ -2,8 +2,7 @@ #define __cmCursesLabelWidget_h #include "cmCursesWidget.h" -#include -#include +#include "cmCursesStandardIncludes.h" class cmCursesLabelWidget : public cmCursesWidget diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h index f3e7917..5102708 100644 --- a/Source/CursesDialog/cmCursesMainForm.h +++ b/Source/CursesDialog/cmCursesMainForm.h @@ -3,8 +3,7 @@ #include "../cmStandardIncludes.h" #include "cmCursesForm.h" -#include -#include +#include "cmCursesStandardIncludes.h" class cmCursesCacheEntryComposite; diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h new file mode 100644 index 0000000..1cb009b --- /dev/null +++ b/Source/CursesDialog/cmCursesStandardIncludes.h @@ -0,0 +1,7 @@ +#ifdef __hpux + #define _XOPEN_SOURCE_EXTENDED + #define _BOOL_DEFINED +#endif /* __hpux */ + +#include +#include diff --git a/Source/CursesDialog/cmCursesWidget.h b/Source/CursesDialog/cmCursesWidget.h index 9d8ce39..a516bca 100644 --- a/Source/CursesDialog/cmCursesWidget.h +++ b/Source/CursesDialog/cmCursesWidget.h @@ -2,8 +2,7 @@ #define __cmCursesWidget_h #include "../cmCacheManager.h" -#include -#include +#include "cmCursesStandardIncludes.h" class cmCursesWidget { diff --git a/Source/CursesDialog/form/frm_driver.c b/Source/CursesDialog/form/frm_driver.c index 6ea5dab..03e02c2 100644 --- a/Source/CursesDialog/form/frm_driver.c +++ b/Source/CursesDialog/form/frm_driver.c @@ -29,6 +29,9 @@ /**************************************************************************** * Author: Juergen Pfeifer 1995,1997 * ****************************************************************************/ +#ifdef __hpux + #define _XOPEN_SOURCE_EXTENDED +#endif /* __hpux */ #include "form.priv.h" MODULE_ID("$Id$") diff --git a/Source/CursesDialog/form/frm_req_name.c b/Source/CursesDialog/form/frm_req_name.c index e9cd426..30b3aca 100644 --- a/Source/CursesDialog/form/frm_req_name.c +++ b/Source/CursesDialog/form/frm_req_name.c @@ -35,6 +35,9 @@ * Routines to handle external names of menu requests * ***************************************************************************/ +#ifdef __hpux + #define _XOPEN_SOURCE_EXTENDED +#endif /* __hpux */ #include "form.priv.h" MODULE_ID("$Id$") -- cgit v0.12