kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: make it build on Linux 

Alex
This commit is contained in:
Alexander Neundorf 2007-08-21 16:21:09 -04:00
parent a8128f88b7
commit 9eb4ffcc3f
5 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/CMakeLists.txt
View File

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

10
Source/FLTKDialog/CMakeLists.txt
View File

@ -1,4 +1,4 @@
FIND_PACKAGE(FLTK)
FIND_PACKAGE(FLTK REQUIRED)
SET(SRCS
CMakeSetupGUIImplementation.cxx
@ -11,14 +11,10 @@ SET(FLTK_GUI_Files_SRCS
CMakeSetupGUI.fl
)
LINK_LIBRARIES(${FLTK_LIBRARY})
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)

10
Source/FLTKDialog/CMakeSetupGUIImplementation.cxx
View File

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

2
Source/FLTKDialog/FLTKPropertyItemRow.cxx
View File

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

2
Source/FLTKDialog/FLTKPropertyList.cxx
View File

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