cmake/myx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

2.4.26

Browse Source
This commit is contained in:
Andrei Astafev
2024-03-12 10:00:35 +03:00
parent 013b61ab75
commit 9e5b642d3f
7 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MyxCMake/MyxCMakeConfigVersion.cmake
View File

@ -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()

19
MyxCMake/lib/AddInterfaceLibrary.cmake
View File

@ -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()