ENH: build fltk cmake on unix with bootstrap

This commit is contained in:
Bill Hoffman 2001-06-19 16:10:38 -04:00
parent 016cc41e6e
commit d6836427b3
4 changed files with 15 additions and 8 deletions

View File

@ -35,7 +35,7 @@ ADD_LIBRARY(CMakeLib SRCS)
# always link in the library # always link in the library
LINK_LIBRARIES(CMakeLib) LINK_LIBRARIES(CMakeLib)
# the library is found here # the library is found here
LINK_DIRECTORIES(${CMAKE}/Sources) LINK_DIRECTORIES(${CMake_BINARY_DIR}/Sources)
ADD_EXECUTABLE(cmake cmakemain) ADD_EXECUTABLE(cmake cmakemain)

View File

@ -7,6 +7,7 @@ FLTKPropertyList
FLTKPropertyNameButtonWithHelp FLTKPropertyNameButtonWithHelp
) )
LINK_LIBRARIES(${FLTK_LIBRARY}) LINK_LIBRARIES(${FLTK_LIBRARY})
IF(WIN32) IF(WIN32)
IF(NOT UNIX) IF(NOT UNIX)
@ -14,6 +15,12 @@ IF(WIN32)
ENDIF(NOT UNIX) ENDIF(NOT UNIX)
ENDIF(WIN32) ENDIF(WIN32)
IF(UNIX)
INCLUDE (${CMAKE_ROOT}/Modules/FindOpenGL.cmake)
LINK_LIBRARIES(${OPENGL_LIBRARY})
ENDIF(UNIX)
INCLUDE_DIRECTORIES(${FLTK_INCLUDE_PATH}) INCLUDE_DIRECTORIES(${FLTK_INCLUDE_PATH})
ADD_EXECUTABLE(CMakeSetupDialog SRCS) ADD_EXECUTABLE(CMakeSetupDialog SRCS)

View File

@ -1,14 +1,14 @@
#include "CMakeSetupGUIImplementation.h" #include "CMakeSetupGUIImplementation.h"
#include "Fl/fl_file_chooser.H" #include "FL/fl_file_chooser.H"
#include "Fl/filename.H" #include "FL/filename.H"
#include "Fl/fl_ask.H" #include "FL/fl_ask.H"
#include "cstring" #include "cstring"
#include "../cmCacheManager.h" #include "../cmCacheManager.h"
#include "../cmMakefile.h" #include "../cmMakefile.h"
#include <iostream> #include <iostream>
#include "FLTKPropertyList.h" #include "FLTKPropertyList.h"
#include "Fl/fl_draw.H" #include "FL/fl_draw.H"
#include "../cmake.h" #include "../cmake.h"

View File

@ -1,7 +1,7 @@
// #include <FLTKPropertyNameButtonWithHelp.h> // #include <FLTKPropertyNameButtonWithHelp.h>
#include <Fl/Fl.H> #include <FL/Fl.H>
#include <Fl/fl_ask.H> #include <FL/fl_ask.H>
#include <Fl/Fl_Menu_Button.H> #include <FL/Fl_Menu_Button.H>
#include "../cmCacheManager.h" #include "../cmCacheManager.h"
#include "FLTKPropertyNameButtonWithHelp.h" #include "FLTKPropertyNameButtonWithHelp.h"