From 5c89a0783d552e791b6a2c931321516dbee6537d Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Sun, 1 Jan 2017 23:51:37 -0500 Subject: [PATCH] Flip recent list; bundle mod path update; version bump --- CMakeLists.txt | 9 +++++---- src/BookmarkMgr.cpp | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 924ccb4..2237b54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/") SET(CUBICSDR_VERSION_MAJOR "0") SET(CUBICSDR_VERSION_MINOR "2") -SET(CUBICSDR_VERSION_PATCH "0") -SET(CUBICSDR_VERSION_SUFFIX "") +SET(CUBICSDR_VERSION_PATCH "1") +SET(CUBICSDR_VERSION_SUFFIX "-alpha-bookmark1") SET(CUBICSDR_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}${CUBICSDR_VERSION_SUFFIX}") SET(CPACK_PACKAGE_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}") @@ -722,9 +722,10 @@ IF (APPLE AND BUNDLE_APP) # SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) IF (BUNDLE_SOAPY_MODS) - message(STATUS "SOAPY_ROOT: ${SOAPY_SDR_ROOT}") - file(GLOB SOAPY_MODS ${SOAPY_SDR_ROOT}/lib/SoapySDR/modules/*.so) + SET(SOAPY_SDR_MOD_PATH "${SOAPY_SDR_ROOT}/lib/SoapySDR/modules/${SOAPY_SDR_ABI_VERSION}") + + file(GLOB SOAPY_MODS ${SOAPY_MOD_PATH}/*.so) FOREACH(SOAPY_MOD_FILE ${SOAPY_MODS}) INSTALL( FILES "${SOAPY_MOD_FILE}" diff --git a/src/BookmarkMgr.cpp b/src/BookmarkMgr.cpp index ad69746..22e34c7 100644 --- a/src/BookmarkMgr.cpp +++ b/src/BookmarkMgr.cpp @@ -402,7 +402,8 @@ void BookmarkMgr::removeRecent(BookmarkEntry *be) { BookmarkList BookmarkMgr::getRecents() { - return recents; + + return BookmarkList(recents.rbegin(), recents.rend()); }