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

CMake: Fix building tests and sample after making target includes private

Browse Source
This commit is contained in:
Maarten Bent
2022-04-10 00:18:11 +02:00
parent f00e7ced27
commit 13a82b3d67
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/cmake/functions.cmake
View File

@@ -836,6 +836,7 @@ function(wx_add name group)
elseif(group STREQUAL Tests) elseif(group STREQUAL Tests)
target_include_directories(${target_name} PRIVATE ${wxSOURCE_DIR}/tests) target_include_directories(${target_name} PRIVATE ${wxSOURCE_DIR}/tests)
target_include_directories(${target_name} PRIVATE ${wxSOURCE_DIR}/3rdparty/catch/include) target_include_directories(${target_name} PRIVATE ${wxSOURCE_DIR}/3rdparty/catch/include)
target_include_directories(${target_name} PRIVATE ${wxTOOLKIT_INCLUDE_DIRS})
endif() endif()
if(APP_DATA) if(APP_DATA)

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

@@ -218,6 +218,8 @@ wx_list_add_prefix(WIDGETS_RC_FILES icons/
wx_add_sample(widgets IMPORTANT ${SAMPLE_WIDGETS_SRC} wx_add_sample(widgets IMPORTANT ${SAMPLE_WIDGETS_SRC}
DATA ${WIDGETS_RC_FILES} textctrl.cpp ../image/toucan.png:toucan.png DATA ${WIDGETS_RC_FILES} textctrl.cpp ../image/toucan.png:toucan.png
) )
# includes needed by the native widget (like gtk.h)
target_include_directories(widgets PRIVATE ${wxTOOLKIT_INCLUDE_DIRS})
wx_add_sample(wizard DATA wiztest.svg wiztest2.svg DEPENDS wxUSE_WIZARDDLG) wx_add_sample(wizard DATA wiztest.svg wiztest2.svg DEPENDS wxUSE_WIZARDDLG)
wx_add_sample(wrapsizer) wx_add_sample(wrapsizer)