Skip to content
Snippets Groups Projects
Commit 927a23d8 authored by Emmanuel Lepage Vallee's avatar Emmanuel Lepage Vallee
Browse files

build: Create targets for both dynamic and static libraries

Refs #69008
parent c8648dd4
Branches
Tags
No related merge requests found
...@@ -580,6 +580,9 @@ IF(NOT ${ENABLE_STATIC} MATCHES false) ...@@ -580,6 +580,9 @@ IF(NOT ${ENABLE_STATIC} MATCHES false)
) )
ENDIF() ENDIF()
SET(LIB_INSTALL_DIR ${SANE_LIBRARY_PATH})
# Create a CMake config file # Create a CMake config file
# TARGET_INCLUDE_DIRECTORIES(ringclient PUBLIC # TARGET_INCLUDE_DIRECTORIES(ringclient PUBLIC
......
...@@ -6,12 +6,28 @@ SET(LIB_RING_CLIENT_INCLUDE_DIR @INCLUDE_INSTALL_DIR@/libringclient) ...@@ -6,12 +6,28 @@ SET(LIB_RING_CLIENT_INCLUDE_DIR @INCLUDE_INSTALL_DIR@/libringclient)
STRING(REPLACE "${CMAKE_LIBRARY_ARCHITECTURE}" "" SANE_LIBRARY_PATH "${CMAKE_INSTALL_FULL_LIBDIR}" ) STRING(REPLACE "${CMAKE_LIBRARY_ARCHITECTURE}" "" SANE_LIBRARY_PATH "${CMAKE_INSTALL_FULL_LIBDIR}" )
IF(DEFINED ${ENABLE_STATIC}) # First, always set the dynamic path
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.la;.lib")
ELSE()
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib;.so;.dll") SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib;.so;.dll")
SET(LIB_RING_CLIENT_LIBRARY_NAME "ringclient")
FIND_LIBRARY(LIB_RING_CLIENT_LIBRARY_DYNAMIC NAMES ringclient
PATHS ${RING_BUILD_DIR}/.libs
PATHS @LIB_INSTALL_DIR@
PATHS ${CMAKE_INSTALL_PREFIX}/libexec )
#if ENABLE_STATIC is set, default to the static version
IF(DEFINED ${ENABLE_STATIC} OR ${ENABLE_STATIC} MATCHES true)
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.la;.lib")
SET(LIB_RING_CLIENT_LIBRARY_NAME "ringclient_static")
FIND_LIBRARY(LIB_RING_CLIENT_LIBRARY_STATIC NAMES ringclient_static
PATHS ${RING_BUILD_DIR}/.libs
PATHS @LIB_INSTALL_DIR@
PATHS ${CMAKE_INSTALL_PREFIX}/libexec )
ENDIF() ENDIF()
FIND_LIBRARY(LIB_RING_CLIENT_LIBRARY NAMES ringclient
FIND_LIBRARY(LIB_RING_CLIENT_LIBRARY NAMES ${LIB_RING_CLIENT_LIBRARY_NAME}
PATHS ${RING_BUILD_DIR}/.libs PATHS ${RING_BUILD_DIR}/.libs
PATHS @LIB_INSTALL_DIR@
PATHS ${CMAKE_INSTALL_PREFIX}/libexec ) PATHS ${CMAKE_INSTALL_PREFIX}/libexec )
...@@ -630,8 +630,6 @@ void AccountModel::remove(Account* account) ...@@ -630,8 +630,6 @@ void AccountModel::remove(Account* account)
d_ptr->m_lDeletedAccounts << account->id(); d_ptr->m_lDeletedAccounts << account->id();
endRemoveRows(); endRemoveRows();
emit accountRemoved(account); emit accountRemoved(account);
emit dataChanged(index(aindex,0), index(d_ptr->m_lAccounts.size()-1,0));
emit layoutChanged();
//delete account; //delete account;
d_ptr->m_pRemovedAccounts << account; d_ptr->m_pRemovedAccounts << account;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment