diff --git a/jtdx/wsjtx/CMake/Modules/Findhamlib.cmake b/jtdx/wsjtx/CMake/Modules/Findhamlib.cmake

index 340bde1..7049295 100644

--- a/jtdx/wsjtx/CMake/Modules/Findhamlib.cmake

+++ b/jtdx/wsjtx/CMake/Modules/Findhamlib.cmake

@@ -76,7 +76,21 @@ if (WIN32)

   endif ()

 endif ()

+set (METALIST)

+

+if (NOT "${hamlib_INCLUDE_DIRS}" STREQUAL "")

+	set (METALIST ${METALIST} hamlib_INCLUDE_DIRS)

+endif (NOT "${hamlib_INCLUDE_DIRS}" STREQUAL "")

+

+if (NOT "${hamlib_LIBRARIES}" STREQUAL "")

+	set (METALIST ${METALIST} hamlib_LIBRARIES)

+endif (NOT "${hamlib_LIBRARIES}" STREQUAL "")

+

+if (NOT "${hamlib_LIBRARY_DIRS}" STREQUAL "")

+	set (METALIST ${METALIST} hamlib_LIBRARY_DIRS)

+endif (NOT "${hamlib_LIBRARY_DIRS}" STREQUAL "")

+

 # Handle the  QUIETLY and REQUIRED  arguments and set  HAMLIB_FOUND to

 # TRUE if all listed variables are TRUE

 include (FindPackageHandleStandardArgs)

-find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES hamlib_LIBRARY_DIRS)

+find_package_handle_standard_args (hamlib DEFAULT_MSG ${METALIST})