[cmake-commits] alex committed CMakeLists.txt 1.13 1.14 ccmake.cxx 1.34 1.35 cmCursesStandardIncludes.h 1.15 1.16

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Aug 27 09:01:16 EDT 2007


Update of /cvsroot/CMake/CMake/Source/CursesDialog
In directory public:/mounts/ram/cvs-serv32452/Source/CursesDialog

Modified Files:
	CMakeLists.txt ccmake.cxx cmCursesStandardIncludes.h 
Log Message:

COMP: make it build on NetBSD, which has separate curses and ncurses, so
it has to be detected that curses isn't good enough, but ncurses is, and
that ncurses.h instead of curses.h is included

Alex


Index: cmCursesStandardIncludes.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CursesDialog/cmCursesStandardIncludes.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cmCursesStandardIncludes.h	3 Feb 2003 03:32:00 -0000	1.15
+++ cmCursesStandardIncludes.h	27 Aug 2007 13:01:14 -0000	1.16
@@ -20,6 +20,8 @@
  #define _MSE_INT_H
 #endif
 
+#include <cmFormConfigure.h>
+
 #if defined(__hpux)
 # define _BOOL_DEFINED
 # include <sys/time.h>
@@ -28,7 +30,17 @@
 # include <form.h>
 # undef _XOPEN_SOURCE_EXTENDED
 #else
-# include <curses.h>
+/* figure out which curses.h to include */
+# if defined(CURSES_HAVE_NCURSES_H)
+#  include <ncurses.h>
+# elif defined(CURSES_HAVE_NCURSES_NCURSES_H)
+#  include <ncurses/ncurses.h>
+# elif defined(CURSES_HAVE_NCURSES_CURSES_H)
+#  include <ncurses/curses.h>
+# else
+#  include <curses.h>
+# endif
+
 # include <form.h>
 #endif
 

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CursesDialog/CMakeLists.txt,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- CMakeLists.txt	23 Aug 2002 17:46:32 -0000	1.13
+++ CMakeLists.txt	27 Aug 2007 13:01:14 -0000	1.14
@@ -14,15 +14,14 @@
               CursesDialog/ccmake
    )
 
-INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form)
+INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form
+                    ${CMake_BINARY_DIR}/Source/CursesDialog/form)
 LINK_DIRECTORIES(${CMake_BINARY_DIR}/Source/CursesDialog/form)
 INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
 
 
-
-
 ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
 TARGET_LINK_LIBRARIES(ccmake CMakeLib)
 TARGET_LINK_LIBRARIES(ccmake cmForm)
 
-INSTALL_TARGETS(/bin ccmake)
\ No newline at end of file
+INSTALL_TARGETS(/bin ccmake)

Index: ccmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CursesDialog/ccmake.cxx,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ccmake.cxx	28 Jun 2007 15:00:57 -0000	1.34
+++ ccmake.cxx	27 Aug 2007 13:01:14 -0000	1.35
@@ -23,8 +23,8 @@
 #include <sys/ioctl.h>
 
 #include "cmCursesMainForm.h"
+#include "cmCursesStandardIncludes.h"
 
-#include <curses.h>
 #include <form.h>
 
 //----------------------------------------------------------------------------



More information about the Cmake-commits mailing list