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

diff --git a/fdmdv2/CMakeLists.txt b/fdmdv2/CMakeLists.txt
index 35573eff6e79505506620a9eb9a7c22be28c79ac..d9ab06e56615e3b1d9fea1a80f3fd5775cb93a0b 100644 (file)
--- 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 393385be912df68cdf9c1d635853829be95a34d9..080bebf216ef2fec327a94d8894c7e8e8b90de9e 100644 (file)
--- 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