diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-08-21 20:21:09 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-08-21 20:21:09 (GMT) |
| commit | 9eb4ffcc3f90ee88e5c7fb279b64ac07a9f6b670 (patch) | |
| tree | 32fd3fb523c6269ab4e5f7b4e9c2ca50bebb92b3 /Source/FLTKDialog | |
| parent | a8128f88b72d8ea412c54353eae197da8cccc817 (diff) | |
| download | CMake-9eb4ffcc3f90ee88e5c7fb279b64ac07a9f6b670.zip CMake-9eb4ffcc3f90ee88e5c7fb279b64ac07a9f6b670.tar.gz CMake-9eb4ffcc3f90ee88e5c7fb279b64ac07a9f6b670.tar.bz2 | |
COMP: make it build on Linux
Alex
Diffstat (limited to 'Source/FLTKDialog')
| -rw-r--r-- | Source/FLTKDialog/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | Source/FLTKDialog/CMakeSetupGUIImplementation.cxx | 10 | ||||
| -rw-r--r-- | Source/FLTKDialog/FLTKPropertyItemRow.cxx | 2 | ||||
| -rw-r--r-- | Source/FLTKDialog/FLTKPropertyList.cxx | 2 |
4 files changed, 20 insertions, 18 deletions
diff --git a/Source/FLTKDialog/CMakeLists.txt b/Source/FLTKDialog/CMakeLists.txt index 3f585d7..47eea55 100644 --- a/Source/FLTKDialog/CMakeLists.txt +++ b/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) diff --git a/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx b/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx index 5e42f09..8019bb9 100644 --- a/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx +++ b/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) diff --git a/Source/FLTKDialog/FLTKPropertyItemRow.cxx b/Source/FLTKDialog/FLTKPropertyItemRow.cxx index 5c12637..88ba7fe 100644 --- a/Source/FLTKDialog/FLTKPropertyItemRow.cxx +++ b/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" diff --git a/Source/FLTKDialog/FLTKPropertyList.cxx b/Source/FLTKDialog/FLTKPropertyList.cxx index 72c798b..c84cbb8 100644 --- a/Source/FLTKDialog/FLTKPropertyList.cxx +++ b/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" |