Additional hamlib cmake config cleanup.

git-svn-id: https://svn.code.sf.net/p/freetel/code@1294 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/fdmdv2/CMakeLists.txt b/fdmdv2/CMakeLists.txt
index d9ab06e56615e3b1d9fea1a80f3fd5775cb93a0b..a9795cc2ac78e8d4781acfd1f1f524b6f3706b98 100644 (file)
--- a/fdmdv2/CMakeLists.txt
+++ b/fdmdv2/CMakeLists.txt
@@ -228,17 +228,22 @@ endif(PORTAUDIOCPP)
 # Hamlib library
 #
 message(STATUS "Looking for hamlib...")
-find_library(LIBHAMLIB hamlib)
-if(LIBHAMLIB)
-    list(APPEND FREEDV_LINK_LIBS ${LIBHAMLIB})
-    message(STATUS "  hamlib found: ${LIBHAMLIB}")
-else(LIBHAMLIB)
+find_path(HAMLIB_INCLUDE_DIR hamlib/rig.h)
+find_library(HAMLIB_LIBRARY hamlib)
+message(STATUS "Hamlib library: ${HAMLIB_LIBRARY}")
+message(STATUS "Hamlib headers: ${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(FATAL_ERROR "hamlib not found.
 On Linux systems try installing:
     hamlib-devel  (RPM based systems)
     libhamlib-dev (DEB based systems)"
     )
-endif(LIBHAMLIB)
+endif(HAMLIB_LIBRARY AND HAMLIB_INCLUDE_DIR)
+
 
 #
 # Samplerate Library
@@ -420,26 +425,6 @@ 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)