From 6471287045edb3d2a478faaab2c6b1a948384bb3 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 5 Jan 2016 00:46:03 -0500 Subject: [PATCH] Findhamlib.cmake tweaks --- cmake/Modules/Findhamlib.cmake | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cmake/Modules/Findhamlib.cmake b/cmake/Modules/Findhamlib.cmake index ea8d6ea..543643f 100644 --- a/cmake/Modules/Findhamlib.cmake +++ b/cmake/Modules/Findhamlib.cmake @@ -4,6 +4,7 @@ # Change Log: Charles J. Cliffe # Updates: # Jan 2015 - Add /opt/ paths for OSX MacPorts +# - Fix HAMLIB_INCLUDE_DIR absolute search # TODO: # Windows support # Static support @@ -15,15 +16,11 @@ set(HAMLIB_FOUND FALSE) find_path(HAMLIB_INCLUDE_DIR - NAMES rig.h + NAMES hamlib/rig.h PATHS - /usr/include/hamlib /usr/include - /usr/local/include/hamlib /usr/local/include - /opt/local/include/hamlib /opt/local/include - /opt/local/include/hamlib ) find_library(HAMLIB_LIBRARY @@ -43,7 +40,7 @@ find_library(HAMLIB_LIBRARY if(HAMLIB_INCLUDE_DIR AND HAMLIB_LIBRARY) set(HAMLIB_FOUND TRUE) - message(STATUS "Hamlib version: ${VERSION}") + # message(STATUS "Hamlib version: ${VERSION}") message(STATUS "Found hamlib library directory at: ${HAMLIB_LIBRARY}") message(STATUS "Found hamlib include directory at: ${HAMLIB_INCLUDE_DIR}") endif(HAMLIB_INCLUDE_DIR AND HAMLIB_LIBRARY)