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

Правки для CMake 3.7

Browse Source
This commit is contained in:
Andrei Astafev 2023-04-13 09:58:45 +03:00
parent 93b9043b88
commit 899afc37c5
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MyxCMake/lib/AddInterfaceLibrary.cmake
View File

@ -82,7 +82,7 @@ function(myx_add_interface_library TARGET_NAME)
# то созданная цель исключается из цели `all`.
# При этом сама цель `${TARGET_NAME}` может участвовать в сборке,
# если окажется в перечне зависимостей.
if(NOT PROJECT_IS_TOP_LEVEL)
if((NOT PROJECT_IS_TOP_LEVEL) AND (${CMAKE_VERSION} VERSION_GREATER "3.8.0"))
set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL True)
return()
endif()

5
MyxCMake/lib/Qt5TargetSetup.cmake
View File

@ -19,7 +19,10 @@ function(myx_qt5_target_setup TARGET_NAME)
if(__target_type STREQUAL "EXECUTABLE")
target_link_libraries(${TARGET_NAME} PRIVATE "Qt5::${iter}")
endif()
if((__target_type STREQUAL "SHARED_LIBRARY") OR (__target_type STREQUAL "OBJECT_LIBRARY"))
if(__target_type STREQUAL "SHARED_LIBRARY")
target_link_libraries(${TARGET_NAME} PUBLIC "Qt5::${iter}")
endif()
if((${CMAKE_VERSION} VERSION_GREATER "3.8.0") AND (__target_type STREQUAL "OBJECT_LIBRARY"))
target_link_libraries(${TARGET_NAME} PUBLIC "Qt5::${iter}")
endif()
endif()

2
MyxCMake/lib/TargetSetup.cmake
View File

@ -108,6 +108,8 @@ function(myx_target_setup TARGET_NAME)
endif()
endif()
endif()
else()
target_link_libraries(${TARGET_NAME} PRIVATE ${__link_library})
endif()
endforeach()
endif()