2.0.31

MyxCMake/lib/AddInterfaceLibrary.cmake

@@ -62,14 +62,16 @@ function(myx_add_interface_library TARGET_NAME)
 
   if(ARG_LINK_LIBRARIES)
     target_link_libraries(${TARGET_NAME} INTERFACE ${ARG_LINK_LIBRARIES})
-    foreach(__lib ${ARG_LINK_LIBRARIES})
-      if(TARGET ${__lib})
-        install(
-          TARGETS ${__lib}
-          EXPORT ${TARGET_NAME}Targets
-          COMPONENT DEV)
-      endif()
-    endforeach()
+    if(${CMAKE_VERSION} VERSION_GREATER "3.15.0")
+      foreach(__lib ${ARG_LINK_LIBRARIES})
+        if(TARGET ${__lib})
+          install(
+            TARGETS ${__lib}
+            EXPORT ${TARGET_NAME}Targets
+            COMPONENT DEV)
+        endif()
+      endforeach()
+    endif()
   endif()
 
   # Библиотека, состоящая только из заголовочных файлов не требует сборки.

MyxCMake/lib/Qt5TargetSetup.cmake

@@ -87,7 +87,11 @@ function(myx_qt5_target_setup TARGET_NAME)
     target_sources(${TARGET_NAME} PRIVATE ${qrc_l10n})
   endif()
   unset(tr)
-  target_sources(${TARGET_NAME} PRIVATE ${ARG_PUBLIC_MOC} ${ARG_PRIVATE_MOC} ${moc_cpp} ${ui_h} ${qrc_cpp})
+  if(target_type STREQUAL "INTERFACE_LIBRARY")
+    target_sources(${TARGET_NAME} INTERFACE ${ARG_PUBLIC_MOC} ${ARG_PRIVATE_MOC} ${moc_cpp} ${ui_h} ${qrc_cpp})
+  else()
+    target_sources(${TARGET_NAME} PRIVATE ${ARG_PUBLIC_MOC} ${ARG_PRIVATE_MOC} ${moc_cpp} ${ui_h} ${qrc_cpp})
+  endif()
 
   # Установка публичных заголовочных файлов
   if(PROJECT_IS_TOP_LEVEL)