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

Fix build errors after modifying CMake setup.h.in

Browse Source 
Always set a value to ICONV_CONST so it will be defined in setup.h.
Add a check for strtoull to prevent a macro redefined warning.
Link with WebKit framework to fix macOS build with wxUSE_WEBKIT.
This commit is contained in:
Maarten Bent 2018-10-24 22:40:39 +02:00
parent 6363db488f
commit a02bb61e90
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/cmake/lib/core/CMakeLists.txt
View File

@ -70,6 +70,11 @@ if(WXOSX_COCOA)
wx_lib_link_libraries(core PUBLIC wx_lib_link_libraries(core PUBLIC
"-framework AudioToolbox" "-framework AudioToolbox"
) )
if(wxUSE_WEBKIT)
wx_lib_link_libraries(core PUBLIC
"-framework WebKit"
)
endif()
endif() endif()
if(WXGTK AND wxUSE_PRIVATE_FONTS) if(WXGTK AND wxUSE_PRIVATE_FONTS)
wx_lib_include_directories(core PUBLIC wx_lib_include_directories(core PUBLIC

3
build/cmake/setup.cmake
View File

@ -221,6 +221,7 @@ if(NOT WIN32)
if(wxUSE_LIBICONV AND NOT APPLE) if(wxUSE_LIBICONV AND NOT APPLE)
find_package(Iconv REQUIRED) find_package(Iconv REQUIRED)
set(HAVE_ICONV ON) set(HAVE_ICONV ON)
set(ICONV_CONST " ")
if(ICONV_SECOND_ARGUMENT_IS_CONST) if(ICONV_SECOND_ARGUMENT_IS_CONST)
set(ICONV_CONST "const") set(ICONV_CONST "const")
endif() endif()
@ -554,7 +555,7 @@ endforeach()
# Check various functions # Check various functions
foreach(func foreach(func
fsync fsync
snprintf vsnprintf strnlen snprintf vsnprintf strnlen strtoull
setpriority setpriority
) )
string(TOUPPER ${func} func_upper) string(TOUPPER ${func} func_upper)