mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-05 22:00:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Build: Link w/ OBJECT library is OK since 3.12

Browse Source
This commit is contained in:
Alex Turbov
2022-08-21 07:11:38 +04:00
committed by Brad King
parent 3b32a1a820
commit 89a1e1c1be
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CMakeLists.txt
+1 -1
View File
@@ -1211,7 +1211,7 @@ if(WIN32)
add_library(CMakeVersion OBJECT "${CMAKE_CURRENT_BINARY_DIR}/CMakeVersion.rc") add_library(CMakeVersion OBJECT "${CMAKE_CURRENT_BINARY_DIR}/CMakeVersion.rc")
set_property(TARGET CMakeVersion PROPERTY INCLUDE_DIRECTORIES "") set_property(TARGET CMakeVersion PROPERTY INCLUDE_DIRECTORIES "")
foreach(_tool IN LISTS _tools) foreach(_tool IN LISTS _tools)
target_sources(${_tool} PRIVATE $<TARGET_OBJECTS:CMakeVersion>) target_link_libraries(${_tool} PRIVATE CMakeVersion)
endforeach() endforeach()
endif() endif()
Source/QtDialog/CMakeLists.txt
+8 -3
View File
@@ -250,14 +250,19 @@ if(USE_LGPL)
endif() endif()
add_library(CMakeGUIMainLib STATIC CMakeSetup.cxx) add_library(CMakeGUIMainLib STATIC CMakeSetup.cxx)
target_link_libraries(CMakeGUIMainLib PUBLIC CMakeGUILib) target_link_libraries(
CMakeGUIMainLib
PUBLIC
CMakeGUILib
CMakeGUIQRCLib
$<TARGET_NAME_IF_EXISTS:CMakeVersion>
)
add_executable(cmake-gui WIN32 MACOSX_BUNDLE CMakeGUIExec.cxx) add_executable(cmake-gui WIN32 MACOSX_BUNDLE CMakeGUIExec.cxx)
target_link_libraries(cmake-gui CMakeGUIMainLib ManifestLib Qt${INSTALLED_QT_VERSION}::Core) target_link_libraries(cmake-gui CMakeGUIMainLib ManifestLib Qt${INSTALLED_QT_VERSION}::Core)
target_sources(CMakeGUIMainLib INTERFACE $<TARGET_OBJECTS:CMakeGUIQRCLib>)
if(WIN32) if(WIN32)
target_sources(CMakeGUIMainLib INTERFACE $<TARGET_OBJECTS:CMakeVersion> CMakeSetup.rc) target_sources(CMakeGUIMainLib INTERFACE CMakeSetup.rc)
endif() endif()
if(APPLE) if(APPLE)
target_sources(CMakeGUIMainLib INTERFACE CMakeSetup.icns) target_sources(CMakeGUIMainLib INTERFACE CMakeSetup.icns)