kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing problems on Sun (name collusions between STL and curses) and disabling curses temporarily.

Browse Source
This commit is contained in:
Berk Geveci 2001-11-05 11:52:27 -05:00
parent 830bb67caf
commit c09d072be3
7 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/CMakeLists.txt
View File

@ -46,12 +46,12 @@ IF (WIN32)
ENDIF(NOT UNIX) ENDIF(NOT UNIX)
ENDIF (WIN32) ENDIF (WIN32)
IF (UNIX) #IF (UNIX)
INCLUDE (${CMAKE_ROOT}/Modules/FindCurses.cmake) # INCLUDE (${CMAKE_ROOT}/Modules/FindCurses.cmake)
IF (CURSES_LIBRARY AND FORM_LIBRARY) # IF (CURSES_LIBRARY)
SUBDIRS(CursesDialog) # SUBDIRS(CursesDialog)
ENDIF (CURSES_LIBRARY AND FORM_LIBRARY) # ENDIF (CURSES_LIBRARY)
ENDIF (UNIX) #ENDIF (UNIX)
SOURCE_FILES(SRCS cmUnixMakefileGenerator.cxx) SOURCE_FILES(SRCS cmUnixMakefileGenerator.cxx)

6
Source/CursesDialog/CMakeLists.txt
View File

@ -1,3 +1,5 @@
SUBDIRS(form)
SOURCE_FILES( CURSES_SRCS SOURCE_FILES( CURSES_SRCS
cmCursesBoolWidget cmCursesBoolWidget
cmCursesCacheEntryComposite cmCursesCacheEntryComposite
@ -13,6 +15,8 @@ SOURCE_FILES( CURSES_SRCS
) )
INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH}) INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
LINK_LIBRARIES(${CURSES_LIBRARY} ${FORM_LIBRARY}) INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form/)
LINK_LIBRARIES(${CURSES_LIBRARY})
LINK_LIBRARIES(cmForm)
ADD_EXECUTABLE(ccurses CURSES_SRCS) ADD_EXECUTABLE(ccurses CURSES_SRCS)

2
Source/CursesDialog/cmCursesCacheEntryComposite.h
View File

@ -1,8 +1,8 @@
#ifndef __cmCursesCacheEntryComposite_h #ifndef __cmCursesCacheEntryComposite_h
#define __cmCursesCacheEntryComposite_h #define __cmCursesCacheEntryComposite_h
#include "cmCursesLabelWidget.h"
#include "../cmCacheManager.h" #include "../cmCacheManager.h"
#include "cmCursesLabelWidget.h"
class cmCursesCacheEntryComposite class cmCursesCacheEntryComposite
{ {

2
Source/CursesDialog/cmCursesLabelWidget.h
View File

@ -1,9 +1,9 @@
#ifndef __cmCursesLabelWidget_h #ifndef __cmCursesLabelWidget_h
#define __cmCursesLabelWidget_h #define __cmCursesLabelWidget_h
#include "cmCursesWidget.h"
#include <curses.h> #include <curses.h>
#include <form.h> #include <form.h>
#include "cmCursesWidget.h"
class cmCursesLabelWidget : public cmCursesWidget class cmCursesLabelWidget : public cmCursesWidget

6
Source/CursesDialog/cmCursesMainForm.cxx
View File

@ -1,3 +1,6 @@
#include "../cmCacheManager.h"
#include "../cmSystemTools.h"
#include "../cmake.h"
#include "cmCursesMainForm.h" #include "cmCursesMainForm.h"
#include "cmCursesStringWidget.h" #include "cmCursesStringWidget.h"
#include "cmCursesLabelWidget.h" #include "cmCursesLabelWidget.h"
@ -6,9 +9,6 @@
#include "cmCursesFilePathWidget.h" #include "cmCursesFilePathWidget.h"
#include "cmCursesDummyWidget.h" #include "cmCursesDummyWidget.h"
#include "cmCursesCacheEntryComposite.h" #include "cmCursesCacheEntryComposite.h"
#include "../cmCacheManager.h"
#include "../cmSystemTools.h"
#include "../cmake.h"
cmCursesMainForm::cmCursesMainForm(const char* whereSource, cmCursesMainForm::cmCursesMainForm(const char* whereSource,
bool newCache) : bool newCache) :

4
Source/CursesDialog/cmCursesMainForm.h
View File

@ -1,10 +1,10 @@
#ifndef __cmCursesMainForm_h #ifndef __cmCursesMainForm_h
#define __cmCursesMainForm_h #define __cmCursesMainForm_h
#include <curses.h>
#include <form.h>
#include "../cmStandardIncludes.h" #include "../cmStandardIncludes.h"
#include "cmCursesForm.h" #include "cmCursesForm.h"
#include <curses.h>
#include <form.h>
class cmCursesCacheEntryComposite; class cmCursesCacheEntryComposite;

2
Source/CursesDialog/cmCursesWidget.h
View File

@ -1,9 +1,9 @@
#ifndef __cmCursesWidget_h #ifndef __cmCursesWidget_h
#define __cmCursesWidget_h #define __cmCursesWidget_h
#include "../cmCacheManager.h"
#include <curses.h> #include <curses.h>
#include <form.h> #include <form.h>
#include "../cmCacheManager.h"
class cmCursesWidget class cmCursesWidget
{ {