diff options
Diffstat (limited to 'cmake/QtFeature.cmake')
| -rw-r--r-- | cmake/QtFeature.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake index 54222b6696..5d65915fab 100644 --- a/cmake/QtFeature.cmake +++ b/cmake/QtFeature.cmake @@ -236,7 +236,7 @@ function(qt_feature_check_and_save_user_provided_value resultVar feature conditi if (DEFINED "FEATURE_${feature}") # Revisit new user provided value set(user_value "${FEATURE_${feature}}") - set(result "${user_value}") + string(TOUPPER "${user_value}" result) # If the build is marked as dirty and the user_value doesn't meet the new condition, # reset it to the computed one. @@ -921,6 +921,7 @@ function(qt_config_compile_test name) # fail instead of cmake abort later via CMAKE_REQUIRED_LIBRARIES. string(FIND "${library}" "::" cmake_target_namespace_separator) if(NOT cmake_target_namespace_separator EQUAL -1) + message(STATUS "Performing Test ${arg_LABEL} - Failed because ${library} not found") set(HAVE_${name} FALSE) break() endif() @@ -995,6 +996,7 @@ function(qt_get_platform_try_compile_vars out_var) list(APPEND flags "CMAKE_CXX_FLAGS_RELEASE") list(APPEND flags "CMAKE_CXX_FLAGS_RELWITHDEBINFO") list(APPEND flags "CMAKE_OBJCOPY") + list(APPEND flags "CMAKE_EXE_LINKER_FLAGS") # Pass toolchain files. if(CMAKE_TOOLCHAIN_FILE) |