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

7 files changed, 19 insertions, 15 deletions

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 1447966..944197e 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -46,12 +46,12 @@ IF (WIN32)
   ENDIF(NOT UNIX)
 ENDIF (WIN32)
 
-IF (UNIX)
-  INCLUDE (${CMAKE_ROOT}/Modules/FindCurses.cmake)
-  IF (CURSES_LIBRARY AND FORM_LIBRARY)
-    SUBDIRS(CursesDialog)
-  ENDIF (CURSES_LIBRARY AND FORM_LIBRARY)
-ENDIF (UNIX)
+#IF (UNIX)
+#  INCLUDE (${CMAKE_ROOT}/Modules/FindCurses.cmake)
+#  IF (CURSES_LIBRARY)
+#    SUBDIRS(CursesDialog)
+#  ENDIF (CURSES_LIBRARY)
+#ENDIF (UNIX)
 
 SOURCE_FILES(SRCS cmUnixMakefileGenerator.cxx)
 
diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
index 63d958d..d0dad7c 100644
--- a/Source/CursesDialog/CMakeLists.txt
+++ b/Source/CursesDialog/CMakeLists.txt
@@ -1,3 +1,5 @@
+SUBDIRS(form)
+
 SOURCE_FILES( CURSES_SRCS
               cmCursesBoolWidget
               cmCursesCacheEntryComposite
@@ -13,6 +15,8 @@ SOURCE_FILES( CURSES_SRCS
             )
 
 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)
\ No newline at end of file
diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.h b/Source/CursesDialog/cmCursesCacheEntryComposite.h
index 743ddf2..49465ea 100644
--- a/Source/CursesDialog/cmCursesCacheEntryComposite.h
+++ b/Source/CursesDialog/cmCursesCacheEntryComposite.h
@@ -1,8 +1,8 @@
 #ifndef __cmCursesCacheEntryComposite_h
 #define __cmCursesCacheEntryComposite_h
 
-#include "cmCursesLabelWidget.h"
 #include "../cmCacheManager.h"
+#include "cmCursesLabelWidget.h"
 
 class cmCursesCacheEntryComposite
 {
diff --git a/Source/CursesDialog/cmCursesLabelWidget.h b/Source/CursesDialog/cmCursesLabelWidget.h
index 21e9e71..6d3a7cf 100644
--- a/Source/CursesDialog/cmCursesLabelWidget.h
+++ b/Source/CursesDialog/cmCursesLabelWidget.h
@@ -1,9 +1,9 @@
 #ifndef __cmCursesLabelWidget_h
 #define __cmCursesLabelWidget_h
 
+#include "cmCursesWidget.h"
 #include <curses.h>
 #include <form.h>
-#include "cmCursesWidget.h"
 
 
 class cmCursesLabelWidget : public cmCursesWidget
diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index 8d173ee..5663218 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -1,3 +1,6 @@
+#include "../cmCacheManager.h"
+#include "../cmSystemTools.h"
+#include "../cmake.h"
 #include "cmCursesMainForm.h"
 #include "cmCursesStringWidget.h"
 #include "cmCursesLabelWidget.h"
@@ -6,9 +9,6 @@
 #include "cmCursesFilePathWidget.h"
 #include "cmCursesDummyWidget.h"
 #include "cmCursesCacheEntryComposite.h"
-#include "../cmCacheManager.h"
-#include "../cmSystemTools.h"
-#include "../cmake.h"
 
 cmCursesMainForm::cmCursesMainForm(const char* whereSource, 
 				   bool newCache) :
diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h
index 79f4609..f3e7917 100644
--- a/Source/CursesDialog/cmCursesMainForm.h
+++ b/Source/CursesDialog/cmCursesMainForm.h
@@ -1,10 +1,10 @@
 #ifndef __cmCursesMainForm_h
 #define __cmCursesMainForm_h
 
-#include <curses.h>
-#include <form.h>
 #include "../cmStandardIncludes.h"
 #include "cmCursesForm.h"
+#include <curses.h>
+#include <form.h>
 
 class cmCursesCacheEntryComposite;
 
diff --git a/Source/CursesDialog/cmCursesWidget.h b/Source/CursesDialog/cmCursesWidget.h
index cea3d51..9d8ce39 100644
--- a/Source/CursesDialog/cmCursesWidget.h
+++ b/Source/CursesDialog/cmCursesWidget.h
@@ -1,9 +1,9 @@
 #ifndef __cmCursesWidget_h
 #define __cmCursesWidget_h
 
+#include "../cmCacheManager.h"
 #include <curses.h>
 #include <form.h>
-#include "../cmCacheManager.h"
 
 class cmCursesWidget
 {