From 52ff1cef93ddee736cc4f0707bc665d1a5acae46 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 2 Jun 2025 19:18:42 +0200 Subject: [PATCH] [cmake] install SSO-MIB if build by ExternalProject * Install the library if we build it as part of FreeRDP * Format files with cmake-format --- client/common/CMakeLists.txt | 3 +++ cmake/FindSSO_MIB.cmake | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt index f82bf1486..b9fce56a6 100644 --- a/client/common/CMakeLists.txt +++ b/client/common/CMakeLists.txt @@ -43,6 +43,9 @@ endif() if(WITH_SSO_MIB) find_package(SSO_MIB REQUIRED) + if(SSO_MIB_INSTALL_LIBRARIES) + install(FILES ${SSO_MIB_INSTALL_LIBRARIES} DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() endif() if(NOT APPLE AND NOT WIN32 AND NOT ANDROID) diff --git a/cmake/FindSSO_MIB.cmake b/cmake/FindSSO_MIB.cmake index 6f8aab710..5384df09d 100644 --- a/cmake/FindSSO_MIB.cmake +++ b/cmake/FindSSO_MIB.cmake @@ -22,7 +22,10 @@ else() set(SSO_MIB_EXTERNAL_DIR ${CMAKE_BINARY_DIR}/sso-mib-external) set(SSO_MIB_URL https://github.com/siemens/sso-mib.git) - set(SSO_MIB_VERSION v0.5.0) + set(SSO_MIB_VERSION_MAJOR 0) + set(SSO_MIB_VERSION_MINOR 5) + set(SSO_MIB_VERSION_PATCH 0) + set(SSO_MIB_VERSION v${SSO_MIB_VERSION_MAJOR}.${SSO_MIB_VERSION_MINOR}.${SSO_MIB_VERSION_PATCH}) message(STATUS "Adding sso-mib as ExternalProject from ${SSO_MIB_URL}, version ${SSO_MIB_VERSION}") ExternalProject_Add( @@ -47,6 +50,13 @@ else() set(SSO_MIB_INCLUDE_DIRS ${SSO_MIB_EXTERNAL_DIR}/install/include ${PC_SSO_MIB_INCLUDE_DIRS}) set(SSO_MIB_LIBRARIES ${SSO_MIB_EXTERNAL_DIR}/install/lib/libsso-mib.so ${PC_SSO_MIB_LIBRARIES}) + if(BUILD_SHARED_LIBS) + set(SSO_MIB_INSTALL_LIBRARIES + ${SSO_MIB_EXTERNAL_DIR}/install/lib/libsso-mib.so + ${SSO_MIB_EXTERNAL_DIR}/install/lib/libsso-mib.so.${SSO_MIB_VERSION_MAJOR} + ${SSO_MIB_EXTERNAL_DIR}/install/lib/libsso-mib.so.${SSO_MIB_VERSION_MAJOR}.${SSO_MIB_VERSION_MINOR}.${SSO_MIB_VERSION_PATCH} + ) + endif() endif() mark_as_advanced(SSO_MIB_INCLUDE_DIR SSO_MIB_LIBRARY)