From 4a05fff74d9eb7b691b872869de924a5c77b9727 Mon Sep 17 00:00:00 2001
From: Diane Trout <diane@caltech.edu>
Date: Fri, 7 Apr 2006 22:40:55 +0000
Subject: [PATCH] build fltk version and deal with debian qt4 weirdness Debian
 named the qt4 qmake/moc commands -qt4 which the standard cmake has trouble
 finding so I manaullay looked for them.

additionally the fltk stuff doesn't look for .H as used for newer fltk
installations so I had to manually look for that as well.
---
 CMakeLists.txt                       |  2 ++
 Makefile.noqt                        |  1 -
 gui/CMakeLists.txt                   | 33 ++++++++++++++++++++++++++++
 gui/module.mk                        |  9 +++++++-
 mussa_fltk.cpp => gui/mussa_fltk.cpp |  0
 module.mk                            | 16 --------------
 qui/CMakeLists.txt                   |  4 ++++
 7 files changed, 47 insertions(+), 18 deletions(-)
 create mode 100644 gui/CMakeLists.txt
 rename mussa_fltk.cpp => gui/mussa_fltk.cpp (100%)
 delete mode 100644 module.mk

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a13315..0709be1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,4 +10,6 @@ SET (CXX_FLAGS "-g")
 # all of our source files al relative to the root of our project
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
 ADD_SUBDIRECTORY( alg )
+ADD_SUBDIRECTORY( gui )
 ADD_SUBDIRECTORY( qui )
+
diff --git a/Makefile.noqt b/Makefile.noqt
index 8599b3f..e3c0a75 100644
--- a/Makefile.noqt
+++ b/Makefile.noqt
@@ -27,7 +27,6 @@ include alg/module.mk
 include alg/test/module.mk
 include py/module.mk
 include gui/module.mk
-include module.mk
 
 # process what the module.mks defined
 OBJ := $(patsubst %.cpp,%.o, $(filter %.cpp,$(SRC))) 
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
new file mode 100644
index 0000000..01169b5
--- /dev/null
+++ b/gui/CMakeLists.txt
@@ -0,0 +1,33 @@
+# recent versions of FLTK on debian have FL/Fl.H instead of Fl.h
+FIND_PATH(FLTK_INCLUDE_DIR FL/Fl.H /usr/include)
+FIND_LIBRARY(FLTK_LIBRARY fltk /usr/lib )
+
+IF(FLTK_INCLUDE_DIR)
+  SET(FLTK_FOUND 1)
+ENDIF(FLTK_INCLUDE_DIR)
+
+FIND_PACKAGE(Boost)
+
+SET(SOURCES 
+      AnnotWindow.cpp
+      ConnView.cpp
+      ConnWindow.cpp
+      MotifWindow.cpp
+      mussa_fltk.cpp
+      SeqTextWindow.cpp
+      SeqView.cpp
+      SeqWindow.cpp
+      SetupWindow.cpp
+      SubAnalysisWindow.cpp
+    )
+
+IF(FLTK_FOUND)
+  ADD_EXECUTABLE(mussa_fltk WIN32 MACOSX_BUNDLE ${SOURCES})
+  LINK_DIRECTORIES(${MUSSA_BINARY_DIR}/alg)
+  TARGET_LINK_LIBRARIES(mussa_fltk 
+                            mussa_core
+			    ${BOOST_FILESYSTEM_LIB}
+			    ${FLTK_LIBRARY})
+ELSE(FLTK_FOUND)
+  MESSAGE(STATUS "Not building old FTLK version")
+ENDIF(FLTK_FOUND)
diff --git a/gui/module.mk b/gui/module.mk
index 255f172..3204672 100644
--- a/gui/module.mk
+++ b/gui/module.mk
@@ -4,6 +4,7 @@ SOURCES.cpp := AnnotWindow.cpp \
                ConnView.cpp \
                ConnWindow.cpp \
                MotifWindow.cpp \
+	       mussa_fltk.cpp \
                SeqTextWindow.cpp \
                SeqView.cpp \
                SeqWindow.cpp \
@@ -14,4 +15,10 @@ MUSSA_FLTK_SRC := $(addprefix $(CURDIR), $(SOURCES.cpp))
 MUSSA_FLTK_OBJ := $(MUSSA_FLTK_SRC:.cpp=$(OBJEXT))
 
 SRC += $(MUSSA_FLTK_SRC)
-CXXFLAGS += 
+CXXFLAGS += -I$(BASEDIR)
+
+MUSSA := $(CURDIR)/mussa$(BINEXT)
+TARGETBITS += $(MUSSA)
+
+$(MUSSA): $(MUSSASRC:.cpp=$(OBJEXT)) $(MUSSA_FLTK_OBJ) $(MUSSA_ALG_OBJ)
+        g++ $(CXXFLAGS) -lfltk -o $@ $^
diff --git a/mussa_fltk.cpp b/gui/mussa_fltk.cpp
similarity index 100%
rename from mussa_fltk.cpp
rename to gui/mussa_fltk.cpp
diff --git a/module.mk b/module.mk
deleted file mode 100644
index b24137d..0000000
--- a/module.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-CURDIR := $(BASEDIR)
-
-SOURCES.cpp := mussa_fltk.cpp \
-							 #seqcomp.cxx \ #(old seqcomp)
-							 #mussa_nway_refine.cxx \ (broken code)
-
-MUSSASRC := $(addprefix $(CURDIR), $(SOURCES.cpp))
-
-SRC += $(MUSSASRC)
-CXXFLAGS += -I$(CURDIR)
-
-MUSSA := $(CURDIR)/mussa$(BINEXT) 
-TARGETBINS += $(MUSSA)
-
-$(MUSSA): $(MUSSASRC:.cpp=$(OBJEXT)) $(MUSSA_FLTK_OBJ) $(MUSSA_ALG_OBJ)
-	g++ $(CXXFLAGS) -lfltk -o $@ $^
diff --git a/qui/CMakeLists.txt b/qui/CMakeLists.txt
index c085ca4..f01a15a 100644
--- a/qui/CMakeLists.txt
+++ b/qui/CMakeLists.txt
@@ -1,3 +1,7 @@
+#deal with some debian wierdness
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE qmake-qt4 )
+FIND_PROGRAM(QT_MOC_EXECUTABLE moc-qt4 )
+
 FIND_PACKAGE(Qt4)
 SET(QT_USE_QTOPENGL 1)
 INCLUDE( ${QT_USE_FILE} )
-- 
2.30.2