From 61acb47f5458c1b3e3c909e31867240a8219efaf Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Thu, 28 Jun 2001 14:53:08 -0400 Subject: [PATCH] BUG: fix for sgi compiler --- Source/FLTKDialog/CMakeLists.txt | 6 ++++++ Source/FLTKDialog/CMakeSetupGUIImplementation.cxx | 1 - Source/FLTKDialog/FLTKPropertyItemRow.cxx | 2 +- Source/FLTKDialog/FLTKPropertyList.cxx | 1 - 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Source/FLTKDialog/CMakeLists.txt b/Source/FLTKDialog/CMakeLists.txt index 4c5b273195..1ab9374bb6 100644 --- a/Source/FLTKDialog/CMakeLists.txt +++ b/Source/FLTKDialog/CMakeLists.txt @@ -23,3 +23,9 @@ INCLUDE_DIRECTORIES(${FLTK_INCLUDE_PATH}) ADD_EXECUTABLE(CMakeSetup SRCS) INSTALL_TARGETS (/bin CMakeSetup) + +IF(CMAKE_HAS_X) +LINK_LIBRARIES(-lXt -lm) +LINK_LIBRARIES(${CMAKE_X_LIBS}) +ADD_DEFINITIONS(${CMAKE_X_CFLAGS}) +ENDIF(CMAKE_HAS_X) \ No newline at end of file diff --git a/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx b/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx index 7f1a20f7a3..7754ba44c2 100644 --- a/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx +++ b/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx @@ -3,7 +3,6 @@ #include "FL/fl_file_chooser.H" #include "FL/filename.H" #include "FL/fl_ask.H" -#include "cstring" #include "../cmCacheManager.h" #include "../cmMakefile.h" #include diff --git a/Source/FLTKDialog/FLTKPropertyItemRow.cxx b/Source/FLTKDialog/FLTKPropertyItemRow.cxx index 3c6f591c03..d1f455c8f7 100644 --- a/Source/FLTKDialog/FLTKPropertyItemRow.cxx +++ b/Source/FLTKDialog/FLTKPropertyItemRow.cxx @@ -12,7 +12,7 @@ #include "../cmCacheManager.h" #include "FLTKPropertyList.h" #include "CMakeSetupGUIImplementation.h" -#include + namespace fltk { diff --git a/Source/FLTKDialog/FLTKPropertyList.cxx b/Source/FLTKDialog/FLTKPropertyList.cxx index 8422f0730d..70a625596e 100644 --- a/Source/FLTKDialog/FLTKPropertyList.cxx +++ b/Source/FLTKDialog/FLTKPropertyList.cxx @@ -9,7 +9,6 @@ #include "FL/Fl_Color_Chooser.H" #include "FL/fl_ask.H" #include "FL/Fl_Button.H" -#include #include "CMakeSetupGUIImplementation.h"