From 6df9bfd1677c15ff92c770ec310772d9a4370149 Mon Sep 17 00:00:00 2001
From: "Charles J. Cliffe" <cj@cubicproductions.com>
Date: Thu, 28 Apr 2016 19:35:55 -0400
Subject: [PATCH] CMakeLists hamlib cleanup

---
 CMakeLists.txt | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f37bf81..5b5362d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
 
 SET(CUBICSDR_VERSION_MAJOR "0")
 SET(CUBICSDR_VERSION_MINOR "1")
-SET(CUBICSDR_VERSION_PATCH "27")
+SET(CUBICSDR_VERSION_PATCH "28")
 SET(CUBICSDR_VERSION_REL "alpha")
 SET(CUBICSDR_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}-${CUBICSDR_VERSION_REL}")
 
@@ -55,16 +55,7 @@ if (USE_HAMLIB)
     endif ()
     
     include_directories(${HAMLIB_INCLUDE_DIR})
-    # IF(HAMLIB_STATIC_LIBRARY)
-    #     link_libraries(${HAMLIB_STATIC_LIBRARY} usb ltdl)
-    #     foreach(HAMLIB_STATIC_MOD ${HAMLIB_STATIC_MODS})
-    #         link_libraries(${HAMLIB_STATIC_MOD})
-    #         message(STATUS "Adding hamlib linkage ${HAMLIB_STATIC_MOD}")
-    #     endforeach()
-    #
-    # ELSE()
     link_libraries(${HAMLIB_LIBRARY})
-    # ENDIF()
 
 	ADD_DEFINITIONS(-DUSE_HAMLIB)	    
 endif ()
@@ -712,26 +703,6 @@ IF (APPLE AND BUNDLE_APP)
               " COMPONENT Runtime)
        ENDFOREACH()
    ENDIF(BUNDLE_SOAPY_MODS)
-
-  #  IF (USE_HAMLIB)
-  #     get_filename_component(HAMLIB_LIBFOLDER ${HAMLIB_LIBRARY} DIRECTORY)
-  #     file(GLOB HAMLIB_MODS ${HAMLIB_LIBFOLDER}/hamlib-*.so)
-  #
-  #     FOREACH(HAMLIB_MOD_FILE ${HAMLIB_MODS})
-  #             INSTALL( FILES "${HAMLIB_MOD_FILE}"
-  #                 DESTINATION "${APPS}/Contents/MacOS/Resources"
-  #                 COMPONENT Runtime
-  #             )
-  #     ENDFOREACH()
-  #
-  #     FOREACH(HAMLIB_MOD_FILE ${HAMLIB_MODS})
-  #         GET_FILENAME_COMPONENT(HAMLIB_MOD_NAME ${HAMLIB_MOD_FILE} NAME)
-  #         message(STATUS "Bundling ${HAMLIB_MOD_NAME} from ${HAMLIB_MOD_FILE}")
-  #         INSTALL(CODE "
-  #             fixup_bundle(\"${APPS}\"   \"${APPS}/Contents/MacOS/Resources/${HAMLIB_MOD_NAME}\"   \"${HAMLIB_LIBFOLDER}\")
-  #            " COMPONENT Runtime)
-  #     ENDFOREACH()
-  # ENDIF()
    
    IF (CUBICSDR_CODE_SIGN)
        SET (CUBICSDR_CERT "3rd Party Mac Developer Application: [Name]" CACHE STRING "Code signing certificate name.")