dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-03 14:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

FindwxWidgets: Add support for wxQt

Browse Source
This commit is contained in:
Craig Sturdy
2019-11-12 08:30:39 +00:00
committed by Brad King
parent c1d5d5eb11
commit fe54989fcd
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Modules/FindwxWidgets.cmake
View File

@@ -243,22 +243,24 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
#------------------------------------------------------------------- #-------------------------------------------------------------------
# #
# Get filename components for a configuration. For example, # Get filename components for a configuration. For example,
# if _CONFIGURATION = mswunivud, then _UNV=univ, _UCD=u _DBG=d # if _CONFIGURATION = mswunivud, then _PF="msw", _UNV=univ, _UCD=u _DBG=d
# if _CONFIGURATION = mswu, then _UNV="", _UCD=u _DBG="" # if _CONFIGURATION = mswu, then _PF="msw", _UNV="", _UCD=u _DBG=""
# #
macro(WX_GET_NAME_COMPONENTS _CONFIGURATION _UNV _UCD _DBG) macro(WX_GET_NAME_COMPONENTS _CONFIGURATION _PF _UNV _UCD _DBG)
DBG_MSG_V(${_CONFIGURATION})
string(REGEX MATCH "univ" ${_UNV} "${_CONFIGURATION}") string(REGEX MATCH "univ" ${_UNV} "${_CONFIGURATION}")
string(REGEX REPLACE "msw.*(u)[d]*$" "u" ${_UCD} "${_CONFIGURATION}") string(REGEX REPLACE "[msw|qt].*(u)[d]*$" "u" ${_UCD} "${_CONFIGURATION}")
if(${_UCD} STREQUAL ${_CONFIGURATION}) if(${_UCD} STREQUAL ${_CONFIGURATION})
set(${_UCD} "") set(${_UCD} "")
endif() endif()
string(REGEX MATCH "d$" ${_DBG} "${_CONFIGURATION}") string(REGEX MATCH "d$" ${_DBG} "${_CONFIGURATION}")
string(REGEX MATCH "^[msw|qt]*" ${_PF} "${_CONFIGURATION}")
endmacro() endmacro()
# #
# Find libraries associated to a configuration. # Find libraries associated to a configuration.
# #
macro(WX_FIND_LIBS _UNV _UCD _DBG) macro(WX_FIND_LIBS _PF _UNV _UCD _DBG)
DBG_MSG_V("m_unv = ${_UNV}") DBG_MSG_V("m_unv = ${_UNV}")
DBG_MSG_V("m_ucd = ${_UCD}") DBG_MSG_V("m_ucd = ${_UCD}")
DBG_MSG_V("m_dbg = ${_DBG}") DBG_MSG_V("m_dbg = ${_DBG}")
@@ -310,13 +312,13 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# Find wxWidgets monolithic library. # Find wxWidgets monolithic library.
find_library(WX_mono${_DBG} find_library(WX_mono${_DBG}
NAMES NAMES
wxmsw${_UNV}31${_UCD}${_DBG} wx${_PF}${_UNV}31${_UCD}${_DBG}
wxmsw${_UNV}30${_UCD}${_DBG} wx${_PF}${_UNV}30${_UCD}${_DBG}
wxmsw${_UNV}29${_UCD}${_DBG} wx${_PF}${_UNV}29${_UCD}${_DBG}
wxmsw${_UNV}28${_UCD}${_DBG} wx${_PF}${_UNV}28${_UCD}${_DBG}
wxmsw${_UNV}27${_UCD}${_DBG} wx${_PF}${_UNV}27${_UCD}${_DBG}
wxmsw${_UNV}26${_UCD}${_DBG} wx${_PF}${_UNV}26${_UCD}${_DBG}
wxmsw${_UNV}25${_UCD}${_DBG} wx${_PF}${_UNV}25${_UCD}${_DBG}
PATHS ${WX_LIB_DIR} PATHS ${WX_LIB_DIR}
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
@@ -327,13 +329,13 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
stc ribbon propgrid webview) stc ribbon propgrid webview)
find_library(WX_${LIB}${_DBG} find_library(WX_${LIB}${_DBG}
NAMES NAMES
wxmsw${_UNV}31${_UCD}${_DBG}_${LIB} wx${_PF}${_UNV}31${_UCD}${_DBG}_${LIB}
wxmsw${_UNV}30${_UCD}${_DBG}_${LIB} wx${_PF}${_UNV}30${_UCD}${_DBG}_${LIB}
wxmsw${_UNV}29${_UCD}${_DBG}_${LIB} wx${_PF}${_UNV}29${_UCD}${_DBG}_${LIB}
wxmsw${_UNV}28${_UCD}${_DBG}_${LIB} wx${_PF}${_UNV}28${_UCD}${_DBG}_${LIB}
wxmsw${_UNV}27${_UCD}${_DBG}_${LIB} wx${_PF}${_UNV}27${_UCD}${_DBG}_${LIB}
wxmsw${_UNV}26${_UCD}${_DBG}_${LIB} wx${_PF}${_UNV}26${_UCD}${_DBG}_${LIB}
wxmsw${_UNV}25${_UCD}${_DBG}_${LIB} wx${_PF}${_UNV}25${_UCD}${_DBG}_${LIB}
PATHS ${WX_LIB_DIR} PATHS ${WX_LIB_DIR}
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
@@ -512,6 +514,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
find_path(wxWidgets_LIB_DIR find_path(wxWidgets_LIB_DIR
NAMES NAMES
qtu/wx/setup.h
msw/wx/setup.h msw/wx/setup.h
mswd/wx/setup.h mswd/wx/setup.h
mswu/wx/setup.h mswu/wx/setup.h
@@ -533,6 +536,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
else() else()
find_path(wxWidgets_LIB_DIR find_path(wxWidgets_LIB_DIR
NAMES NAMES
qtu/wx/setup.h
msw/wx/setup.h msw/wx/setup.h
mswd/wx/setup.h mswd/wx/setup.h
mswu/wx/setup.h mswu/wx/setup.h
@@ -571,7 +575,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
endif() endif()
# Search for available configuration types. # Search for available configuration types.
foreach(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw) foreach(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw qt qtd qtu qtud)
set(WX_${CFG}_FOUND FALSE) set(WX_${CFG}_FOUND FALSE)
if(EXISTS ${WX_LIB_DIR}/${CFG}) if(EXISTS ${WX_LIB_DIR}/${CFG})
list(APPEND WX_CONFIGURATION_LIST ${CFG}) list(APPEND WX_CONFIGURATION_LIST ${CFG})
@@ -611,7 +615,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
endif() endif()
# Get configuration parameters from the name. # Get configuration parameters from the name.
WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG) WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} PF UNV UCD DBG)
# Set wxWidgets lib setup include directory. # Set wxWidgets lib setup include directory.
if(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h) if(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
@@ -631,7 +635,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
endif() endif()
# Find wxWidgets libraries. # Find wxWidgets libraries.
WX_FIND_LIBS("${UNV}" "${UCD}" "${DBG}") WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "${DBG}")
if(WX_USE_REL_AND_DBG) if(WX_USE_REL_AND_DBG)
WX_FIND_LIBS("${UNV}" "${UCD}" "d") WX_FIND_LIBS("${UNV}" "${UCD}" "d")
endif() endif()