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

CMake: Allow to specify specific Info.plist.in file for samples

Browse Source
This commit is contained in:
Maarten Bent
2021-08-17 21:50:48 +02:00
parent 1fbda84306
commit 4862cbd4c6
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build/cmake/functions.cmake
View File

@@ -681,7 +681,7 @@ endfunction()
# Add sample, test, demo or benchmark # Add sample, test, demo or benchmark
# wx_add(<name> <group> [CONSOLE|CONSOLE_GUI|DLL] [IMPORTANT] [SRC_FILES...] # wx_add(<name> <group> [CONSOLE|CONSOLE_GUI|DLL] [IMPORTANT] [SRC_FILES...]
# [LIBRARIES ...] [NAME target_name] [FOLDER folder] # [LIBRARIES ...] [NAME target_name] [FOLDER folder]
# [DATA ...] [DEFINITIONS ...] [RES ...]) # [DATA ...] [DEFINITIONS ...] [RES ...] [PLIST ...)
# name default target name # name default target name
# group can be Samples, Tests, Demos or Benchmarks # group can be Samples, Tests, Demos or Benchmarks
# first parameter may be CONSOLE to indicate a console application or DLL to indicate a shared library # first parameter may be CONSOLE to indicate a console application or DLL to indicate a shared library
@@ -696,6 +696,7 @@ endfunction()
# DATA followed by required data files. Use a colon to separate different source and dest paths # DATA followed by required data files. Use a colon to separate different source and dest paths
# DEFINITIONS list of definitions for the target # DEFINITIONS list of definitions for the target
# RES followed by WIN32 .rc files # RES followed by WIN32 .rc files
# PLIST followed by macOS Info.plist.in file
# #
# Additionally the following variables may be set before calling wx_add_sample: # Additionally the following variables may be set before calling wx_add_sample:
# wxSAMPLE_SUBDIR subdirectory in the samples/ folder to use as base # wxSAMPLE_SUBDIR subdirectory in the samples/ folder to use as base
@@ -721,7 +722,7 @@ function(wx_add name group)
cmake_parse_arguments(APP cmake_parse_arguments(APP
"CONSOLE;CONSOLE_GUI;DLL;IMPORTANT" "CONSOLE;CONSOLE_GUI;DLL;IMPORTANT"
"NAME;FOLDER" "NAME;FOLDER"
"DATA;DEFINITIONS;DEPENDS;LIBRARIES;RES" "DATA;DEFINITIONS;DEPENDS;LIBRARIES;RES;PLIST"
${ARGN} ${ARGN}
) )
@@ -868,8 +869,12 @@ function(wx_add name group)
if(APPLE) if(APPLE)
if(NOT IPHONE) if(NOT IPHONE)
set(PLIST_FILE "${wxSOURCE_DIR}/src/osx/carbon/Info.plist.in")
if(APP_PLIST)
set(PLIST_FILE "${wxSOURCE_DIR}/${SUB_DIR}/${APP_PLIST}")
endif()
set_target_properties(${target_name} PROPERTIES set_target_properties(${target_name} PROPERTIES
MACOSX_BUNDLE_INFO_PLIST "${wxSOURCE_DIR}/src/osx/carbon/Info.plist.in" MACOSX_BUNDLE_INFO_PLIST "${PLIST_FILE}"
RESOURCE "${wxSOURCE_DIR}/src/osx/carbon/wxmac.icns") RESOURCE "${wxSOURCE_DIR}/src/osx/carbon/wxmac.icns")
endif() endif()
set_target_properties(${target_name} PROPERTIES set_target_properties(${target_name} PROPERTIES

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

@@ -38,7 +38,7 @@ wx_add_sample(dialup nettest.cpp LIBRARIES wxnet DEPENDS wxUSE_DIALUP_MANAGER)
wx_add_sample(display) wx_add_sample(display)
wx_add_sample(dnd dnd.cpp RES dnd.rc DATA wxwin.png DEPENDS wxUSE_DRAG_AND_DROP) wx_add_sample(dnd dnd.cpp RES dnd.rc DATA wxwin.png DEPENDS wxUSE_DRAG_AND_DROP)
wx_add_sample(docview docview.cpp doc.cpp view.cpp docview.h doc.h view.h wx_add_sample(docview docview.cpp doc.cpp view.cpp docview.h doc.h view.h
RES docview.rc LIBRARIES wxaui DEPENDS wxUSE_DOC_VIEW_ARCHITECTURE) RES docview.rc PLIST Info.plist.in LIBRARIES wxaui DEPENDS wxUSE_DOC_VIEW_ARCHITECTURE)
wx_add_sample(dragimag dragimag.cpp dragimag.h RES dragimag.rc wx_add_sample(dragimag dragimag.cpp dragimag.h RES dragimag.rc
DATA backgrnd.png shape01.png shape02.png shape03.png DATA backgrnd.png shape01.png shape02.png shape03.png
DEPENDS wxUSE_DRAGIMAGE) DEPENDS wxUSE_DRAGIMAGE)
@@ -75,7 +75,7 @@ wx_add_sample(image image.cpp canvas.cpp canvas.h cursor_png.c RES image.rc
foreach(lang ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP) foreach(lang ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP)
list(APPEND INTERNAT_DATA_FILES ${lang}/internat.po ${lang}/internat.mo) list(APPEND INTERNAT_DATA_FILES ${lang}/internat.po ${lang}/internat.mo)
endforeach() endforeach()
wx_add_sample(internat DATA ${INTERNAT_DATA_FILES} DEPENDS wxUSE_INTL) wx_add_sample(internat DATA ${INTERNAT_DATA_FILES} PLIST Info.plist.in DEPENDS wxUSE_INTL)
# IPC samples # IPC samples
set(wxSAMPLE_FOLDER ipc) set(wxSAMPLE_FOLDER ipc)
wx_add_sample(ipc client.cpp client.h connection.h ipcsetup.h NAME ipcclient LIBRARIES wxnet DEPENDS wxUSE_IPC) wx_add_sample(ipc client.cpp client.h connection.h ipcsetup.h NAME ipcclient LIBRARIES wxnet DEPENDS wxUSE_IPC)