[cmake-commits] alex committed CMakeLists.txt 1.10 1.11 CMakeSetupGUIImplementation.cxx 1.29 1.30 FLTKPropertyItemRow.cxx 1.19 1.20 FLTKPropertyList.cxx 1.9 1.10

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/FLTKDialog
In directory public:/mounts/ram/cvs-serv30433/FLTKDialog

Modified Files:
	CMakeLists.txt CMakeSetupGUIImplementation.cxx 
	FLTKPropertyItemRow.cxx FLTKPropertyList.cxx 
Log Message:

COMP: make it build on Linux

Alex


Index: FLTKPropertyItemRow.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/FLTKDialog/FLTKPropertyItemRow.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- FLTKPropertyItemRow.cxx	23 Sep 2005 21:47:32 -0000	1.19
+++ FLTKPropertyItemRow.cxx	21 Aug 2007 20:21:09 -0000	1.20
@@ -22,7 +22,7 @@
 #include <FL/Fl_Input.H>
 #include <FL/Fl_Tile.H>
 #include <FL/fl_ask.H>
-#include <FL/fl_file_chooser.H>
+#include <FL/Fl_File_Chooser.H>
 #include <FL/Fl_Color_Chooser.H>
 #include <FL/Fl_Menu_Button.H>
 #include "../cmCacheManager.h"

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/FLTKDialog/CMakeLists.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- CMakeLists.txt	23 Sep 2005 21:47:46 -0000	1.10
+++ CMakeLists.txt	21 Aug 2007 20:21:09 -0000	1.11
@@ -1,24 +1,20 @@
-FIND_PACKAGE(FLTK)
+FIND_PACKAGE(FLTK REQUIRED)
 
 SET(SRCS
-CMakeSetupGUIImplementation.cxx
-FLTKDialog.cxx
-FLTKPropertyItemRow.cxx
-FLTKPropertyList.cxx
-)
+  CMakeSetupGUIImplementation.cxx
+  FLTKDialog.cxx
+  FLTKPropertyItemRow.cxx
+  FLTKPropertyList.cxx
+  )
 
 SET(FLTK_GUI_Files_SRCS
-CMakeSetupGUI.fl
-)
-
-
-LINK_LIBRARIES(${FLTK_LIBRARY})
-
+  CMakeSetupGUI.fl
+  )
 
 INCLUDE_DIRECTORIES(${FLTK_INCLUDE_PATH})
 
 FLTK_WRAP_UI(FLCMakeSetup ${FLTK_GUI_Files_SRCS})
 
-ADD_EXECUTABLE(FLCMakeSetup ${SRCS} ${FLCMakeSetup_FLTK_SRCS})
-TARGET_LINK_LIBRARIES(FLCMakeSetup CMakeLib)
+ADD_EXECUTABLE(FLCMakeSetup ${SRCS} ${FLCMakeSetup_FLTK_UI_SRCS} )
+TARGET_LINK_LIBRARIES(FLCMakeSetup ${FLTK_LIBRARY} CMakeLib)
 

Index: CMakeSetupGUIImplementation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- CMakeSetupGUIImplementation.cxx	23 Sep 2005 21:47:32 -0000	1.29
+++ CMakeSetupGUIImplementation.cxx	21 Aug 2007 20:21:09 -0000	1.30
@@ -16,7 +16,7 @@
 =========================================================================*/
 
 #include "CMakeSetupGUIImplementation.h"
-#include "FL/fl_file_chooser.H"
+#include "FL/Fl_File_Chooser.H"
 #include "FL/filename.H"
 #include "FL/fl_ask.H"
 #include "../cmCacheManager.h"
@@ -348,8 +348,14 @@
     m_CMakeInstance->SetStartDirectory(m_WhereSource.c_str());
     m_CMakeInstance->SetHomeOutputDirectory(m_WhereBuild.c_str());
     m_CMakeInstance->SetStartOutputDirectory(m_WhereBuild.c_str());
+    const char* defaultGenerator = 0;
+#if defined(_WIN32)
+    defaultGenerator = "NMake Makefiles";
+#else defined(_WIN32)
+    defaultGenerator = "Unix Makefiles";
+#endif defined(_WIN32)
     m_CMakeInstance->SetGlobalGenerator(
-      m_CMakeInstance->CreateGlobalGenerator("NMake Makefiles"));
+      m_CMakeInstance->CreateGlobalGenerator(defaultGenerator));
     m_CMakeInstance->SetCMakeCommand(m_PathToExecutable.c_str());
     m_CMakeInstance->LoadCache();
     if(m_CMakeInstance->Configure() != 0)

Index: FLTKPropertyList.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/FLTKDialog/FLTKPropertyList.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- FLTKPropertyList.cxx	23 Sep 2005 21:47:32 -0000	1.9
+++ FLTKPropertyList.cxx	21 Aug 2007 20:21:09 -0000	1.10
@@ -21,7 +21,7 @@
 #include "../cmCacheManager.h"
 #include "FLTKPropertyItemRow.h"
 #include "FL/filename.H"
-#include "FL/fl_file_chooser.H"
+#include "FL/Fl_File_Chooser.H"
 #include "FL/Fl_Color_Chooser.H"
 #include "FL/fl_ask.H"
 #include "FL/Fl_Button.H"