From 9e5b642d3f997330ae989318471a1ec0f3d9ab7b Mon Sep 17 00:00:00 2001
From: Andrei Astafev <dev@246060.ru>
Date: Tue, 12 Mar 2024 10:00:35 +0300
Subject: [PATCH] 2.4.26

---
 MyxCMake/MyxCMakeConfigVersion.cmake   |  2 +-
 MyxCMake/lib/AddInterfaceLibrary.cmake | 19 ++++++++-----------
 README.md                              |  2 +-
 VERSION                                |  2 +-
 debian/CMakeLists.txt                  |  2 +-
 debian/changelog                       |  2 +-
 myx_setup.cmake                        |  4 ++--
 7 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake
index e01039d..ee09e14 100644
--- a/MyxCMake/MyxCMakeConfigVersion.cmake
+++ b/MyxCMake/MyxCMakeConfigVersion.cmake
@@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "2.4.25")
+set(MYX_CMAKE_PACKAGE_VERSION "2.4.26")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
diff --git a/MyxCMake/lib/AddInterfaceLibrary.cmake b/MyxCMake/lib/AddInterfaceLibrary.cmake
index 789cb04..b7a58ed 100644
--- a/MyxCMake/lib/AddInterfaceLibrary.cmake
+++ b/MyxCMake/lib/AddInterfaceLibrary.cmake
@@ -59,24 +59,21 @@ function(myx_add_interface_library TARGET_NAME)
   if(ARG_LINK_LIBRARIES)
     foreach(__lib ${ARG_LINK_LIBRARIES})
       if(TARGET ${__lib})
-        if(${CMAKE_VERSION} VERSION_GREATER "3.15.0")
-          target_link_libraries(${TARGET_NAME} INTERFACE ${__lib})
-          install(
-            TARGETS ${__lib}
-            EXPORT ${TARGET_NAME}Targets
-            COMPONENT DEV)
-        else()
+        set(__exlib ${__lib})
+        if(${CMAKE_VERSION} VERSION_LESS "3.15.0")
           get_target_property(__target_type ${__lib} TYPE)
           if(__target_type STREQUAL "OBJECT_LIBRARY")
             if(TARGET "${__lib}_static")
-              target_link_libraries(${TARGET_NAME} INTERFACE "${__lib}_static")
+              set(__exlib "${__lib}_static")
             elseif(TARGET "${__lib}_shared")
-              target_link_libraries(${TARGET_NAME} INTERFACE "${__lib}_shared")
+              set(__exlib "${__lib}_shared")
             endif()
-          else()
-            target_link_libraries(${TARGET_NAME} INTERFACE ${__lib})
           endif()
         endif()
+        target_link_libraries(${TARGET_NAME} INTERFACE ${__exlib})
+        #        install(TARGETS ${__exlib}
+        #                EXPORT ${TARGET_NAME}Targets
+        #                COMPONENT DEV)
       endif()
     endforeach()
   endif()
diff --git a/README.md b/README.md
index f5ef077..bf542f4 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 ## Установка
 
 В корневом каталоге проекта создать каталог `cmake` и распаковать в него
-[архив](../../../releases/download/2.4.25/myx-cmake-local-2.4.25.tar.xz ).
+[архив](../../../releases/download/2.4.26/myx-cmake-local-2.4.26.tar.xz ).
 
 ## Использование
 
diff --git a/VERSION b/VERSION
index fb75735..11a0d85 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.25
+2.4.26
diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt
index 6edd8e1..fe56784 100644
--- a/debian/CMakeLists.txt
+++ b/debian/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
-project(myx-cmake VERSION 2.4.25 LANGUAGES)
+project(myx-cmake VERSION 2.4.26 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
diff --git a/debian/changelog b/debian/changelog
index 54d67ef..9914501 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-myx-cmake (2.4.25) unstable; urgency=medium
+myx-cmake (2.4.26) unstable; urgency=medium
 
   * New version.
 
diff --git a/myx_setup.cmake b/myx_setup.cmake
index f5f7e04..679c0a8 100644
--- a/myx_setup.cmake
+++ b/myx_setup.cmake
@@ -20,11 +20,11 @@ if(ENV{MYX_CMAKE_DIR})
   set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR})
 endif()
 if(MYX_CMAKE_DIR)
-  find_package(MyxCMake 2.4.25 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.4.26 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
   myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==")
 else()
   if(MYX_CMAKE_USE_SYSTEM)
-    find_package(MyxCMake 2.4.25 REQUIRED)
+    find_package(MyxCMake 2.4.26 REQUIRED)
     myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)