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

CMake: Remove iOS workaround

Browse Source 
Not needed anymore since the fix in 60c620c28c.

Closes https://github.com/wxWidgets/wxWidgets/pull/2308
This commit is contained in:
Maarten Bent
2021-04-05 21:26:04 +02:00
committed by Vadim Zeitlin
parent e961ca8617
commit c968e49b13
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/cmake/config.cmake
View File

@@ -90,7 +90,7 @@ function(wx_write_config)
set(WX_CHARTYPE ansi) set(WX_CHARTYPE ansi)
set(lib_unicode_suffix) set(lib_unicode_suffix)
endif() endif()
if(CMAKE_CROSSCOMPILING AND NOT IPHONE) if(CMAKE_CROSSCOMPILING)
set(cross_compiling yes) set(cross_compiling yes)
set(host_alias ${CMAKE_SYSTEM_NAME}) set(host_alias ${CMAKE_SYSTEM_NAME})
else() else()

4
build/cmake/functions.cmake
View File

@@ -211,7 +211,7 @@ function(wx_set_target_properties target_name is_base)
endif() endif()
else() else()
set(cross_target "") set(cross_target "")
if (CMAKE_CROSSCOMPILING AND NOT IPHONE) if (CMAKE_CROSSCOMPILING)
set(cross_target "-${CMAKE_SYSTEM_NAME}") set(cross_target "-${CMAKE_SYSTEM_NAME}")
endif () endif ()
@@ -219,7 +219,7 @@ function(wx_set_target_properties target_name is_base)
PROPERTIES PROPERTIES
OUTPUT_NAME wx_${lib_toolkit}${lib_unicode}${lib_flavour}${lib_suffix}-${lib_version}${cross_target} OUTPUT_NAME wx_${lib_toolkit}${lib_unicode}${lib_flavour}${lib_suffix}-${lib_version}${cross_target}
# NOTE: wx-config can not be used to connect the libraries with the debug suffix. # NOTE: wx-config can not be used to connect the libraries with the debug suffix.
#OUTPUT_NAME_DEBUG wx_${lib_toolkit}${lib_unicode}d${lib_flavour}${lib_suffix}-${lib_version} #OUTPUT_NAME_DEBUG wx_${lib_toolkit}${lib_unicode}d${lib_flavour}${lib_suffix}-${lib_version}${cross_target}
OUTPUT_NAME_DEBUG wx_${lib_toolkit}${lib_unicode}${lib_flavour}${lib_suffix}-${lib_version}${cross_target} OUTPUT_NAME_DEBUG wx_${lib_toolkit}${lib_unicode}${lib_flavour}${lib_suffix}-${lib_version}${cross_target}
) )
endif() endif()