COMP: make it build on Linux

Alex

Source/CMakeLists.txt

@@ -377,6 +377,13 @@ IF(BUILD_WXDialog)
   SUBDIRS(WXDialog)
 ENDIF(BUILD_WXDialog)
 
+# FLTK GUI, needs some work: generator selection, paths with spaces, ...
+# OPTION(BUILD_FLTKDialog "Build FLTK dialog for CMake" FALSE)
+# MARK_AS_ADVANCED(BUILD_FLTKDialog)
+# IF(BUILD_FLTKDialog)
+#  SUBDIRS(FLTKDialog)
+# ENDIF(BUILD_FLTKDialog)
+
 INCLUDE (${CMAKE_BINARY_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
 INCLUDE (${CMAKE_SOURCE_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
 

Source/FLTKDialog/CMakeLists.txt

@@ -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)
 

Source/FLTKDialog/CMakeSetupGUIImplementation.cxx

@@ -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 @@ CMakeSetupGUIImplementation
     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)

Source/FLTKDialog/FLTKPropertyItemRow.cxx

@@ -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"

Source/FLTKDialog/FLTKPropertyList.cxx

@@ -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"