Commit 777ec992 authored by Berk Geveci's avatar Berk Geveci

Changes to remove warnings and fix dependencies.

parent 05717b3d
...@@ -34,6 +34,6 @@ SET(EXECUTABLE_OUTPUT_PATH ${CMake_BINARY_DIR}/Source CACHE PATH ...@@ -34,6 +34,6 @@ SET(EXECUTABLE_OUTPUT_PATH ${CMake_BINARY_DIR}/Source CACHE PATH
"Where to put the executables for CMake" "Where to put the executables for CMake"
) )
INCLUDE_REGULAR_EXPRESSION("^(\\.\\./)?(cm|FLTK|CMake).*") INCLUDE_REGULAR_EXPRESSION("^(\\.\\./)?(cm|FLTK|CMake|form).*")
...@@ -14,8 +14,9 @@ SOURCE_FILES( CURSES_SRCS ...@@ -14,8 +14,9 @@ SOURCE_FILES( CURSES_SRCS
ccurses ccurses
) )
INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form)
INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH}) INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form/)
LINK_LIBRARIES(${CURSES_LIBRARY}) LINK_LIBRARIES(${CURSES_LIBRARY})
IF(CURSES_EXTRA_LIBRARY) IF(CURSES_EXTRA_LIBRARY)
......
PROJECT(CMAKE_FORM) PROJECT(CMAKE_FORM)
INCLUDE_REGULAR_EXPRESSION("^.*$")
SOURCE_FILES(FORM_SRCS SOURCE_FILES(FORM_SRCS
fld_arg.c fld_arg.c
fld_attr.c fld_attr.c
......
...@@ -33,7 +33,18 @@ ...@@ -33,7 +33,18 @@
#ifndef FORM_H #ifndef FORM_H
#define FORM_H #define FORM_H
#if defined(__sun__) && defined(__GNUC__)
#define _MSE_INT_H
#endif
#define _BOOL_DEFINED
#include <sys/time.h>
#ifndef _XOPEN_SOURCE_EXTENDED
#define _XOPEN_SOURCE_EXTENDED
#endif /* XOPEN_SOURCE_EXTENDED */
#include <curses.h> #include <curses.h>
#undef _XOPEN_SOURCE_EXTENDED
#include <eti.h> #include <eti.h>
#include <stdarg.h> #include <stdarg.h>
......
...@@ -72,7 +72,7 @@ extern void _nc_leaks_dump_entry(void); ...@@ -72,7 +72,7 @@ extern void _nc_leaks_dump_entry(void);
/* doalloc.c */ /* doalloc.c */
extern void *_nc_doalloc(void *, size_t); extern void *_nc_doalloc(void *, size_t);
#if !HAVE_STRDUP #if !HAVE_STRDUP
#define strdup _nc_strdup /* #define strdup _nc_strdup */
extern char *_nc_strdup(const char *); extern char *_nc_strdup(const char *);
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment