comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-09-14 20:48:00 -04:00
Code Issues Projects Releases Wiki Activity

CMakeLists hamlib cleanup

Browse Source
This commit is contained in:
Charles J. Cliffe 2016-04-28 19:35:55 -04:00
parent 06b1135f0f
commit 6df9bfd167
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
CMakeLists.txt
View File

@ -6,7 +6,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
SET(CUBICSDR_VERSION_MAJOR "0") SET(CUBICSDR_VERSION_MAJOR "0")
SET(CUBICSDR_VERSION_MINOR "1") SET(CUBICSDR_VERSION_MINOR "1")
SET(CUBICSDR_VERSION_PATCH "27") SET(CUBICSDR_VERSION_PATCH "28")
SET(CUBICSDR_VERSION_REL "alpha") SET(CUBICSDR_VERSION_REL "alpha")
SET(CUBICSDR_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}-${CUBICSDR_VERSION_REL}") SET(CUBICSDR_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}-${CUBICSDR_VERSION_REL}")
@ -55,16 +55,7 @@ if (USE_HAMLIB)
endif () endif ()
include_directories(${HAMLIB_INCLUDE_DIR}) 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}) link_libraries(${HAMLIB_LIBRARY})
# ENDIF()
ADD_DEFINITIONS(-DUSE_HAMLIB) ADD_DEFINITIONS(-DUSE_HAMLIB)
endif () endif ()
@ -713,26 +704,6 @@ IF (APPLE AND BUNDLE_APP)
ENDFOREACH() ENDFOREACH()
ENDIF(BUNDLE_SOAPY_MODS) 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) IF (CUBICSDR_CODE_SIGN)
SET (CUBICSDR_CERT "3rd Party Mac Developer Application: [Name]" CACHE STRING "Code signing certificate name.") SET (CUBICSDR_CERT "3rd Party Mac Developer Application: [Name]" CACHE STRING "Code signing certificate name.")
MESSAGE(STATUS "Code Signing Enabled: ${CUBICSDR_CERT}") MESSAGE(STATUS "Code Signing Enabled: ${CUBICSDR_CERT}")