From c968e49b13c8a07a4313d8ed606e2c5f8288cc23 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Mon, 5 Apr 2021 21:26:04 +0200 Subject: [PATCH] CMake: Remove iOS workaround Not needed anymore since the fix in 60c620c28c. Closes https://github.com/wxWidgets/wxWidgets/pull/2308 --- build/cmake/config.cmake | 2 +- build/cmake/functions.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake index 15dff884ea..91d11acba2 100644 --- a/build/cmake/config.cmake +++ b/build/cmake/config.cmake @@ -90,7 +90,7 @@ function(wx_write_config) set(WX_CHARTYPE ansi) set(lib_unicode_suffix) endif() - if(CMAKE_CROSSCOMPILING AND NOT IPHONE) + if(CMAKE_CROSSCOMPILING) set(cross_compiling yes) set(host_alias ${CMAKE_SYSTEM_NAME}) else() diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake index 871e681e51..5597e46a67 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -211,7 +211,7 @@ function(wx_set_target_properties target_name is_base) endif() else() set(cross_target "") - if (CMAKE_CROSSCOMPILING AND NOT IPHONE) + if (CMAKE_CROSSCOMPILING) set(cross_target "-${CMAKE_SYSTEM_NAME}") endif () @@ -219,7 +219,7 @@ function(wx_set_target_properties target_name is_base) PROPERTIES 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. - #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} ) endif()