Bläddra i källkod

ENH: add bootstrap support for building fltk

Bill Hoffman 24 år sedan
förälder
incheckning
d454811a63
3 ändrade filer med 20 tillägg och 5 borttagningar
  1. 17 2
      Source/CMakeLists.txt
  2. 2 2
      Source/FLTKDialog/CMakeSetupGUI.cxx
  3. 1 1
      Source/MFCDialog/CMakeSetupDialog.cpp

+ 17 - 2
Source/CMakeLists.txt

@@ -1,3 +1,12 @@
+INCLUDE (${CMAKE_ROOT}/Modules/FindFLTK.cmake)
+
+
+IF(FLTK_LIBRARY)
+  IF(FLTK_INCLUDE_PATH)
+    SUBDIRS(FLTKDialog)
+  ENDIF(FLTK_INCLUDE_PATH)
+ENDIF(FLTK_LIBRARY)
+
 SOURCE_FILES(SRCS
 cmake  
 cmMakeDepend
@@ -13,7 +22,6 @@ cmCustomCommand
 cmCacheManager
 cmCableClassSet
 cmSourceGroup
-cmakemain
 )
 
 IF (WIN32)
@@ -22,7 +30,14 @@ ELSE (WIN32)
   SOURCE_FILES(SRCS cmUnixMakefileGenerator)
 ENDIF (WIN32)
 
-ADD_EXECUTABLE(cmake SRCS)
+# create a library used by the command line and the GUI
+ADD_LIBRARY(CMakeLib SRCS)
+# always link in the library
+LINK_LIBRARIES(CMakeLib)
+# the library is found here
+LINK_DIRECTORIES(${CMAKE}/Sources)
+
+ADD_EXECUTABLE(cmake cmakemain)
 
 ADD_TEST(burn cmake)
 

+ 2 - 2
Source/FLTKDialog/CMakeSetupGUI.cxx

@@ -127,7 +127,7 @@ void CMakeSetupGUI::Show(void) {
 }
 
 bool CMakeSetupGUI::SetBinaryPath(const char *) {
-}
+return true;}
 
 bool CMakeSetupGUI::SetSourcePath(const char *) {
-}
+return true;}

+ 1 - 1
Source/MFCDialog/CMakeSetupDialog.cpp

@@ -583,7 +583,7 @@ void CMakeSetupDialog::SaveCacheFromGUI()
 void CMakeSetupDialog::OnSize(UINT nType, int cx, int cy) 
 {
   CDialog::OnSize(nType, cx, cy);
-  // TODO: Add your message handler code here
+  
   if(m_CacheEntriesList.m_hWnd)
     {
     m_ListFrame.SetWindowPos(&wndTop, 0, 0, cx-28, cy-137,