diff options
| author | Tomasz Słodkowicz <slodki@users.noreply.github.com> | 2018-10-04 21:57:24 (GMT) |
|---|---|---|
| committer | Tomasz Słodkowicz <slodki@users.noreply.github.com> | 2018-10-10 06:45:56 (GMT) |
| commit | 045b0beae13366420186337170d70e73ec96ebca (patch) | |
| tree | 6a84dac6d77f4f2cc47773315d3dbc4ae1865693 /Modules | |
| parent | 0813581859bd61a9d30c97aa893030bea85f134e (diff) | |
| download | CMake-045b0beae13366420186337170d70e73ec96ebca.zip CMake-045b0beae13366420186337170d70e73ec96ebca.tar.gz CMake-045b0beae13366420186337170d70e73ec96ebca.tar.bz2 | |
FindwxWidgets: implement detailed components status on Windows
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index e61c84e..e366842 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -396,6 +396,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") list(APPEND wxWidgets_LIBRARIES debug ${WX_${LIB}d} optimized ${WX_${LIB}} ) + set(wxWidgets_${LIB}_FOUND TRUE) elseif(NOT wxWidgets_FIND_REQUIRED_${LIB}) DBG_MSG_V("- ignored optional missing WX_${LIB}=${WX_${LIB}} or WX_${LIB}d=${WX_${LIB}d}") else() @@ -410,6 +411,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") if(WX_${LIB}${_DBG}) DBG_MSG_V("Found ${LIB}${_DBG}") list(APPEND wxWidgets_LIBRARIES ${WX_${LIB}${_DBG}}) + set(wxWidgets_${LIB}_FOUND TRUE) elseif(NOT wxWidgets_FIND_REQUIRED_${LIB}) DBG_MSG_V("- ignored optional missing WX_${LIB}${_DBG}=${WX_${LIB}${_DBG}}") else() @@ -978,10 +980,18 @@ DBG_MSG("wxWidgets_USE_FILE : ${wxWidgets_USE_FILE}") include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +# FIXME: set wxWidgets_<comp>_FOUND for wx-config branch +# and use HANDLE_COMPONENTS on Unix too +if(wxWidgets_FIND_STYLE STREQUAL "win32") + set(wxWidgets_HANDLE_COMPONENTS "HANDLE_COMPONENTS") +endif() + find_package_handle_standard_args(wxWidgets REQUIRED_VARS wxWidgets_LIBRARIES wxWidgets_INCLUDE_DIRS VERSION_VAR wxWidgets_VERSION_STRING + ${wxWidgets_HANDLE_COMPONENTS} ) +unset(wxWidgets_HANDLE_COMPONENTS) #===================================================================== # Macros for use in wxWidgets apps. |