diff options
| -rw-r--r-- | Source/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/FLTKDialog/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Source/FLTKDialog/CMakeSetupGUIImplementation.cxx | 8 | ||||
| -rw-r--r-- | Source/FLTKDialog/FLTKPropertyNameButtonWithHelp.cxx | 6 |
4 files changed, 15 insertions, 8 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index aec9fb9..745d2a8 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -35,7 +35,7 @@ ADD_LIBRARY(CMakeLib SRCS) # always link in the library LINK_LIBRARIES(CMakeLib) # the library is found here -LINK_DIRECTORIES(${CMAKE}/Sources) +LINK_DIRECTORIES(${CMake_BINARY_DIR}/Sources) ADD_EXECUTABLE(cmake cmakemain) diff --git a/Source/FLTKDialog/CMakeLists.txt b/Source/FLTKDialog/CMakeLists.txt index 761a896..d110cd8 100644 --- a/Source/FLTKDialog/CMakeLists.txt +++ b/Source/FLTKDialog/CMakeLists.txt @@ -7,6 +7,7 @@ FLTKPropertyList FLTKPropertyNameButtonWithHelp ) + LINK_LIBRARIES(${FLTK_LIBRARY}) IF(WIN32) IF(NOT UNIX) @@ -14,6 +15,12 @@ IF(WIN32) ENDIF(NOT UNIX) ENDIF(WIN32) + +IF(UNIX) + INCLUDE (${CMAKE_ROOT}/Modules/FindOpenGL.cmake) + LINK_LIBRARIES(${OPENGL_LIBRARY}) +ENDIF(UNIX) + INCLUDE_DIRECTORIES(${FLTK_INCLUDE_PATH}) ADD_EXECUTABLE(CMakeSetupDialog SRCS) diff --git a/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx b/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx index ea91e5f..b1eab89 100644 --- a/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx +++ b/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx @@ -1,14 +1,14 @@ #include "CMakeSetupGUIImplementation.h" -#include "Fl/fl_file_chooser.H" -#include "Fl/filename.H" -#include "Fl/fl_ask.H" +#include "FL/fl_file_chooser.H" +#include "FL/filename.H" +#include "FL/fl_ask.H" #include "cstring" #include "../cmCacheManager.h" #include "../cmMakefile.h" #include <iostream> #include "FLTKPropertyList.h" -#include "Fl/fl_draw.H" +#include "FL/fl_draw.H" #include "../cmake.h" diff --git a/Source/FLTKDialog/FLTKPropertyNameButtonWithHelp.cxx b/Source/FLTKDialog/FLTKPropertyNameButtonWithHelp.cxx index b2715ac..1fe27b3 100644 --- a/Source/FLTKDialog/FLTKPropertyNameButtonWithHelp.cxx +++ b/Source/FLTKDialog/FLTKPropertyNameButtonWithHelp.cxx @@ -1,7 +1,7 @@ // #include <FLTKPropertyNameButtonWithHelp.h> -#include <Fl/Fl.H> -#include <Fl/fl_ask.H> -#include <Fl/Fl_Menu_Button.H> +#include <FL/Fl.H> +#include <FL/fl_ask.H> +#include <FL/Fl_Menu_Button.H> #include "../cmCacheManager.h" #include "FLTKPropertyNameButtonWithHelp.h" |