Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: fix linking the DLL sample in monolithic build

Browse Source
This commit is contained in:
Maarten Bent
2020-05-17 19:41:57 +02:00
parent 0f806ad96d
commit ba3fd12efb
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/cmake/functions.cmake
View File

@@ -791,7 +791,9 @@ endfunction()
# Link libraries to a sample # Link libraries to a sample
function(wx_link_sample_libraries name) function(wx_link_sample_libraries name)
target_link_libraries(${name} ${ARGN}) if(TARGET ${name})
target_link_libraries(${name} PUBLIC ${ARGN})
endif()
endfunction() endfunction()
# Add a option and mark is as advanced if it starts with wxUSE_ # Add a option and mark is as advanced if it starts with wxUSE_

6
build/cmake/samples/CMakeLists.txt
View File

@@ -262,10 +262,12 @@ if(WIN32)
if(NOT wxBUILD_SHARED) if(NOT wxBUILD_SHARED)
# this test only makes sense with statically built wx, otherwise # this test only makes sense with statically built wx, otherwise
# the same copy of wx would be used # the same copy of wx would be used
wx_add_sample(dll wx_exe.cpp my_dll.h NAME wx_exe FOLDER dll LIBRARIES my_dll) wx_add_sample(dll wx_exe.cpp my_dll.h NAME wx_exe FOLDER dll)
wx_link_sample_libraries(wx_exe my_dll)
endif() endif()
wx_add_sample(dll sdk_exe.cpp my_dll.h NAME sdk_exe FOLDER dll LIBRARIES my_dll) wx_add_sample(dll sdk_exe.cpp my_dll.h NAME sdk_exe FOLDER dll)
wx_link_sample_libraries(sdk_exe my_dll)
endif() endif()
wx_add_sample(regtest RES regtest.rc DEPENDS wxUSE_REGKEY) wx_add_sample(regtest RES regtest.rc DEPENDS wxUSE_REGKEY)