From 1f44e0abcbe5e7870b33d0cfb88b76fa3546a153 Mon Sep 17 00:00:00 2001
From: hobbes1069 <hobbes1069@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Wed, 29 May 2013 00:55:57 +0000
Subject: [PATCH] Add cmake checks for hamlib and more fixes for updated source
 names.

git-svn-id: https://svn.code.sf.net/p/freetel/code@1293 01035d8c-6547-0410-b346-abe4f91aad63
---
 fdmdv2/CMakeLists.txt     | 21 +++++++++++++++++++++
 fdmdv2/src/CMakeLists.txt |  6 ++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/fdmdv2/CMakeLists.txt b/fdmdv2/CMakeLists.txt
index 35573eff..d9ab06e5 100644
--- a/fdmdv2/CMakeLists.txt
+++ b/fdmdv2/CMakeLists.txt
@@ -420,6 +420,27 @@ endif(NOT USE_STATIC_LIBCTB)
 include_directories(${LIBCTB_INCLUDE_DIR})
 list(APPEND FREEDV_LINK_LIBS ${LIBCTB_LIBRARY})
 
+#
+# Hamlib
+#
+find_package(PkgConfig)
+pkg_check_modules(HAMLIB REQUIRED hamlib)
+set(HAMLIB_DEFINITIONS ${HAMLIB_CFLAGS_OTHER})
+find_path(HAMLIB_INCLUDE_DIR hamlib/rig.h
+    HINTS ${HAMLIB_INCLUDEDIR} ${HAMLIB_INCLUDE_DIRS})
+find_library(HAMLIB_LIBRARY hamlib
+    HINTS ${HAMLIB_LIBDIR} ${HAMLIB_LIBRARY_DIRS})
+message(STATUS "Hamlib  library: ${HAMLIB_LIBRARY}")
+message(STATUS "Hamlib includes: ${HAMLIB_INCLUDE_DIR}")
+if(HAMLIB_LIBRARY AND HAMLIB_INCLUDE_DIR)
+    message(STATUS "Hamlib library found.")
+    include_directories(${HAMLIB_INCLUDE_DIR})
+    list(APPEND FREEDV_LINK_LIBS ${HAMLIB_LIBRARY})
+else(HAMLIB_LIBRARY AND HAMLIB_INCLUDE_DIR)
+    message(STATUS "Hamlib was not found.")
+endif(HAMLIB_LIBRARY AND HAMLIB_INCLUDE_DIR)
+
+
 # Freedv 
 add_subdirectory(src)
 
diff --git a/fdmdv2/src/CMakeLists.txt b/fdmdv2/src/CMakeLists.txt
index 393385be..080bebf2 100644
--- a/fdmdv2/src/CMakeLists.txt
+++ b/fdmdv2/src/CMakeLists.txt
@@ -1,8 +1,9 @@
 set(FREEDV_SOURCES
     dlg_about.cpp
     dlg_audiooptions.cpp
-    dlg_comports.cpp
     dlg_filter.cpp
+    dlg_options.cpp
+    dlg_ptt.cpp
     fdmdv2_main.cpp
     fdmdv2_pa_wrapper.cpp
     fdmdv2_plot.cpp
@@ -17,8 +18,9 @@ set(FREEDV_SOURCES
     comp.h
     dlg_about.h
     dlg_audiooptions.h
-    dlg_comports.h
     dlg_filter.h
+    dlg_options.h
+    dlg_ptt.h
     fdmdv2_defines.h
     fdmdv2_main.h
     fdmdv2_pa_wrapper.h
-- 
2.25.1