commit:     c7c1240b2a698ea660eda88300c76e27b2ccb78f
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Apr  5 10:24:10 2020 +0000
Commit:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
CommitDate: Sun Apr  5 13:21:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c7c1240b

sys-auth/AusweisApp2: change patch

Install shared libs only if the were built

Move insertion to IF(BUILD_SHARED_LIBS)

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>

 .../files/1.20.0-fix-Install.cmake.patch           | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/sys-auth/AusweisApp2/files/1.20.0-fix-Install.cmake.patch 
b/sys-auth/AusweisApp2/files/1.20.0-fix-Install.cmake.patch
index 5948ded..9a18e86 100644
--- a/sys-auth/AusweisApp2/files/1.20.0-fix-Install.cmake.patch
+++ b/sys-auth/AusweisApp2/files/1.20.0-fix-Install.cmake.patch
@@ -1,18 +1,18 @@
 diff --git a/cmake/Install.cmake b/cmake/Install.cmake
-index a13e029..1fa852d 100644
+index a13e029..336785c 100644
 --- a/cmake/Install.cmake
 +++ b/cmake/Install.cmake
-@@ -274,6 +274,13 @@ ELSEIF(UNIX)
+@@ -269,6 +269,13 @@ ELSEIF(ANDROID)
+ ELSEIF(UNIX)
+       IF(BUILD_SHARED_LIBS)
+               SET(CMAKE_INSTALL_RPATH "\$ORIGIN")
++              INSTALL(TARGETS AusweisAppActivation 
AusweisAppActivationCustomScheme AusweisAppActivationIntent
++                      AusweisAppActivationInternal 
AusweisAppActivationWebservice AusweisAppCard AusweisAppCardDrivers
++                      AusweisAppCardPcsc AusweisAppConfiguration 
AusweisAppCore AusweisAppExport AusweisAppFileProvider
++                      AusweisAppGlobal AusweisAppInit AusweisAppNetwork 
AusweisAppRemoteDevice AusweisAppSecureStorage
++                      AusweisAppServices AusweisAppSettings AusweisAppUi 
AusweisAppUiAidl AusweisAppUiCommon
++                      AusweisAppUiJson AusweisAppUiQml AusweisAppUiWebsocket 
AusweisAppUiWidget AusweisAppWhitelistClient
++                      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL)
+       ENDIF()
+ 
        SET(DEFAULT_FILE_DESTINATION 
${CMAKE_INSTALL_DATADIR}/${VENDOR}/AusweisApp2)
-       SET(TRANSLATION_DESTINATION 
${DEFAULT_FILE_DESTINATION}/${TRANSLATION_DESTINATION})
-       INSTALL(TARGETS AusweisApp DESTINATION ${CMAKE_INSTALL_BINDIR} 
COMPONENT Application)
-+      INSTALL(TARGETS AusweisAppActivation AusweisAppActivationCustomScheme 
AusweisAppActivationIntent
-+              AusweisAppActivationInternal AusweisAppActivationWebservice 
AusweisAppCard AusweisAppCardDrivers
-+              AusweisAppCardPcsc AusweisAppConfiguration AusweisAppCore 
AusweisAppExport AusweisAppFileProvider
-+              AusweisAppGlobal AusweisAppInit AusweisAppNetwork 
AusweisAppRemoteDevice AusweisAppSecureStorage
-+              AusweisAppServices AusweisAppSettings AusweisAppUi 
AusweisAppUiAidl AusweisAppUiCommon
-+              AusweisAppUiJson AusweisAppUiQml AusweisAppUiWebsocket 
AusweisAppUiWidget AusweisAppWhitelistClient
-+              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL)
-       
CONFIGURE_FILE(${PACKAGING_DIR}/linux/${BUNDLE_IDENTIFIER}.metainfo.xml.in 
${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_IDENTIFIER}.metainfo.xml @ONLY)
-       CONFIGURE_FILE(${PACKAGING_DIR}/linux/${BUNDLE_IDENTIFIER}.desktop.in 
${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_IDENTIFIER}.desktop @ONLY)
-       INSTALL(FILES 
${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_IDENTIFIER}.metainfo.xml DESTINATION 
${CMAKE_INSTALL_DATADIR}/metainfo COMPONENT Application)

Reply via email to