haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FindwxWidgets.cmake: Use uppercase for macro names

This commit is contained in:
Simon Richter 2016-02-15 18:50:47 +01:00
parent 78a0316a08
commit 6a7fa8950c
1 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
CMakeModules/FindwxWidgets.cmake
View File

@ -234,7 +234,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# if _CONFIGURATION = mswunivud, then _UNV=univ, _UCD=u _DBG=d # if _CONFIGURATION = mswunivud, then _UNV=univ, _UCD=u _DBG=d
# if _CONFIGURATION = mswu, then _UNV="", _UCD=u _DBG="" # if _CONFIGURATION = mswu, then _UNV="", _UCD=u _DBG=""
# #
macro(wx_get_name_components _CONFIGURATION _UNV _UCD _DBG) macro(WX_GET_NAME_COMPONENTS _CONFIGURATION _UNV _UCD _DBG)
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.*(u)[d]*$" "u" ${_UCD} "${_CONFIGURATION}")
if(${_UCD} STREQUAL ${_CONFIGURATION}) if(${_UCD} STREQUAL ${_CONFIGURATION})
@ -246,7 +246,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# #
# Find libraries associated to a configuration. # Find libraries associated to a configuration.
# #
macro(wx_find_libs _UNV _UCD _DBG) macro(WX_FIND_LIBS _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}")
@ -333,47 +333,47 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# Clear all library paths, so that FIND_LIBRARY refinds them. # Clear all library paths, so that FIND_LIBRARY refinds them.
# #
# Clear a lib, reset its found flag, and mark as advanced. # Clear a lib, reset its found flag, and mark as advanced.
macro(wx_clear_lib _LIB) macro(WX_CLEAR_LIB _LIB)
set(${_LIB} "${_LIB}-NOTFOUND" CACHE FILEPATH "Cleared." FORCE) set(${_LIB} "${_LIB}-NOTFOUND" CACHE FILEPATH "Cleared." FORCE)
set(${_LIB}_FOUND FALSE) set(${_LIB}_FOUND FALSE)
mark_as_advanced(${_LIB}) mark_as_advanced(${_LIB})
endmacro() endmacro()
# Clear all debug or release library paths (arguments are "d" or ""). # Clear all debug or release library paths (arguments are "d" or "").
macro(wx_clear_all_libs _DBG) macro(WX_CLEAR_ALL_LIBS _DBG)
# Clear wxWidgets common libraries. # Clear wxWidgets common libraries.
foreach(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla) foreach(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
wx_clear_lib(WX_${LIB}${_DBG}) WX_CLEAR_LIB(WX_${LIB}${_DBG})
endforeach() endforeach()
# Clear wxWidgets multilib base libraries. # Clear wxWidgets multilib base libraries.
wx_clear_lib(WX_base${_DBG}) WX_CLEAR_LIB(WX_base${_DBG})
foreach(LIB net odbc xml) foreach(LIB net odbc xml)
wx_clear_lib(WX_${LIB}${_DBG}) WX_CLEAR_LIB(WX_${LIB}${_DBG})
endforeach() endforeach()
# Clear wxWidgets monolithic library. # Clear wxWidgets monolithic library.
wx_clear_lib(WX_mono${_DBG}) WX_CLEAR_LIB(WX_mono${_DBG})
# Clear wxWidgets multilib libraries. # Clear wxWidgets multilib libraries.
foreach(LIB core adv aui html media xrc dbgrid gl qa richtext foreach(LIB core adv aui html media xrc dbgrid gl qa richtext
webview stc ribbon propgrid) webview stc ribbon propgrid)
wx_clear_lib(WX_${LIB}${_DBG}) WX_CLEAR_LIB(WX_${LIB}${_DBG})
endforeach() endforeach()
endmacro() endmacro()
# Clear all wxWidgets debug libraries. # Clear all wxWidgets debug libraries.
macro(wx_clear_all_dbg_libs) macro(WX_CLEAR_ALL_DBG_LIBS)
wx_clear_all_libs("d") WX_CLEAR_ALL_LIBS("d")
endmacro() endmacro()
# Clear all wxWidgets release libraries. # Clear all wxWidgets release libraries.
macro(wx_clear_all_rel_libs) macro(WX_CLEAR_ALL_REL_LIBS)
wx_clear_all_libs("") WX_CLEAR_ALL_LIBS("")
endmacro() endmacro()
# #
# Set the wxWidgets_LIBRARIES variable. # Set the wxWidgets_LIBRARIES variable.
# Also, Sets output variable wxWidgets_FOUND to FALSE if it fails. # Also, Sets output variable wxWidgets_FOUND to FALSE if it fails.
# #
macro(wx_set_libraries _LIBS _DBG) macro(WX_SET_LIBRARIES _LIBS _DBG)
DBG_MSG_V("Looking for ${${_LIBS}}") DBG_MSG_V("Looking for ${${_LIBS}}")
if(WX_USE_REL_AND_DBG) if(WX_USE_REL_AND_DBG)
foreach(LIB ${${_LIBS}}) foreach(LIB ${${_LIBS}})
@ -523,8 +523,8 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# If wxWidgets_LIB_DIR changed, clear all libraries. # If wxWidgets_LIB_DIR changed, clear all libraries.
if(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR) if(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
set(WX_LIB_DIR ${wxWidgets_LIB_DIR} CACHE INTERNAL "wxWidgets_LIB_DIR") set(WX_LIB_DIR ${wxWidgets_LIB_DIR} CACHE INTERNAL "wxWidgets_LIB_DIR")
wx_clear_all_dbg_libs() WX_CLEAR_ALL_DBG_LIBS()
wx_clear_all_rel_libs() WX_CLEAR_ALL_REL_LIBS()
endif() endif()
if(WX_LIB_DIR) if(WX_LIB_DIR)
@ -575,7 +575,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} 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)
@ -595,13 +595,13 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
endif() endif()
# Find wxWidgets libraries. # Find wxWidgets libraries.
wx_find_libs("${UNV}" "${UCD}" "${DBG}") WX_FIND_LIBS("${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()
# Settings for requested libs (i.e., include dir, libraries, etc.). # Settings for requested libs (i.e., include dir, libraries, etc.).
wx_set_libraries(wxWidgets_FIND_COMPONENTS "${DBG}") WX_SET_LIBRARIES(wxWidgets_FIND_COMPONENTS "${DBG}")
# Add necessary definitions for unicode builds # Add necessary definitions for unicode builds
if("${UCD}" STREQUAL "u") if("${UCD}" STREQUAL "u")
@ -626,7 +626,7 @@ else()
# #
# Set the default values based on "wx-config --selected-config". # Set the default values based on "wx-config --selected-config".
# #
macro(wx_config_select_get_default) macro(WX_CONFIG_SELECT_GET_DEFAULT)
execute_process( execute_process(
COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
${wxWidgets_CONFIG_OPTIONS} --selected-config ${wxWidgets_CONFIG_OPTIONS} --selected-config
@ -655,7 +655,7 @@ else()
# has both builds available. If so, provide the selection option # has both builds available. If so, provide the selection option
# to the user. # to the user.
# #
macro(wx_config_select_query_bool _OPT_NAME _OPT_HELP) macro(WX_CONFIG_SELECT_QUERY_BOOL _OPT_NAME _OPT_HELP)
execute_process( execute_process(
COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
${wxWidgets_CONFIG_OPTIONS} --${_OPT_NAME}=yes ${wxWidgets_CONFIG_OPTIONS} --${_OPT_NAME}=yes
@ -690,7 +690,7 @@ else()
# Set wxWidgets_SELECT_OPTIONS to wx-config options for selecting # Set wxWidgets_SELECT_OPTIONS to wx-config options for selecting
# among multiple builds. # among multiple builds.
# #
macro(wx_config_select_set_options) macro(WX_CONFIG_SELECT_SET_OPTIONS)
set(wxWidgets_SELECT_OPTIONS ${wxWidgets_CONFIG_OPTIONS}) set(wxWidgets_SELECT_OPTIONS ${wxWidgets_CONFIG_OPTIONS})
foreach(_opt_name debug static unicode universal) foreach(_opt_name debug static unicode universal)
string(TOUPPER ${_opt_name} _upper_opt_name) string(TOUPPER ${_opt_name} _upper_opt_name)
@ -716,16 +716,16 @@ else()
set(wxWidgets_FOUND TRUE) set(wxWidgets_FOUND TRUE)
# get defaults based on "wx-config --selected-config" # get defaults based on "wx-config --selected-config"
wx_config_select_get_default() WX_CONFIG_SELECT_GET_DEFAULT()
# for each option: if both builds are available, provide option # for each option: if both builds are available, provide option
wx_config_select_query_bool(debug "Use debug build?") WX_CONFIG_SELECT_QUERY_BOOL(debug "Use debug build?")
wx_config_select_query_bool(unicode "Use unicode build?") WX_CONFIG_SELECT_QUERY_BOOL(unicode "Use unicode build?")
wx_config_select_query_bool(universal "Use universal build?") WX_CONFIG_SELECT_QUERY_BOOL(universal "Use universal build?")
wx_config_select_query_bool(static "Link libraries statically?") WX_CONFIG_SELECT_QUERY_BOOL(static "Link libraries statically?")
# process selection to set wxWidgets_SELECT_OPTIONS # process selection to set wxWidgets_SELECT_OPTIONS
wx_config_select_set_options() WX_CONFIG_SELECT_SET_OPTIONS()
DBG_MSG("wxWidgets_SELECT_OPTIONS=${wxWidgets_SELECT_OPTIONS}") DBG_MSG("wxWidgets_SELECT_OPTIONS=${wxWidgets_SELECT_OPTIONS}")
# run the wx-config program to get cxxflags # run the wx-config program to get cxxflags
@ -915,18 +915,18 @@ find_program(wxWidgets_wxrc_EXECUTABLE wxrc
) )
# #
# wx_split_arguments_on(<keyword> <left> <right> <arg1> <arg2> ...) # WX_SPLIT_ARGUMENTS_ON(<keyword> <left> <right> <arg1> <arg2> ...)
# #
# Sets <left> and <right> to contain arguments to the left and right, # Sets <left> and <right> to contain arguments to the left and right,
# respectively, of <keyword>. # respectively, of <keyword>.
# #
# Example usage: # Example usage:
# function(wxwidgets_add_resources outfiles) # function(WXWIDGETS_ADD_RESOURCES outfiles)
# wx_split_arguments_on(OPTIONS wxrc_files wxrc_options ${ARGN}) # WX_SPLIT_ARGUMENTS_ON(OPTIONS wxrc_files wxrc_options ${ARGN})
# ... # ...
# endfunction() # endfunction()
# #
# wxwidgets_add_resources(sources ${xrc_files} OPTIONS -e -o file.C) # WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o file.C)
# #
# NOTE: This is a generic piece of code that should be renamed to # NOTE: This is a generic piece of code that should be renamed to
# SPLIT_ARGUMENTS_ON and put in a file serving the same purpose as # SPLIT_ARGUMENTS_ON and put in a file serving the same purpose as
@ -935,7 +935,7 @@ find_program(wxWidgets_wxrc_EXECUTABLE wxrc
# here a bit more generalized. So, there are already two find modules # here a bit more generalized. So, there are already two find modules
# using this approach. # using this approach.
# #
function(wx_split_arguments_on _keyword _leftvar _rightvar) function(WX_SPLIT_ARGUMENTS_ON _keyword _leftvar _rightvar)
# FIXME: Document that the input variables will be cleared. # FIXME: Document that the input variables will be cleared.
#list(APPEND ${_leftvar} "") #list(APPEND ${_leftvar} "")
#list(APPEND ${_rightvar} "") #list(APPEND ${_rightvar} "")
@ -960,7 +960,7 @@ function(wx_split_arguments_on _keyword _leftvar _rightvar)
endfunction() endfunction()
# #
# wx_get_dependencies_from_xml( # WX_GET_DEPENDENCIES_FROM_XML(
# <depends> # <depends>
# <match_pattern> # <match_pattern>
# <clean_pattern> # <clean_pattern>
@ -970,7 +970,7 @@ endfunction()
# #
# FIXME: Add documentation here... # FIXME: Add documentation here...
# #
function(wx_get_dependencies_from_xml function(WX_GET_DEPENDENCIES_FROM_XML
_depends _depends
_match_patt _match_patt
_clean_patt _clean_patt
@ -999,18 +999,18 @@ function(wx_get_dependencies_from_xml
endfunction() endfunction()
# #
# wxwidgets_add_resources(<sources> <xrc_files> # WXWIDGETS_ADD_RESOURCES(<sources> <xrc_files>
# OPTIONS <options> [NO_CPP_CODE]) # OPTIONS <options> [NO_CPP_CODE])
# #
# Adds a custom command for resource file compilation of the # Adds a custom command for resource file compilation of the
# <xrc_files> and appends the output files to <sources>. # <xrc_files> and appends the output files to <sources>.
# #
# Example usages: # Example usages:
# wxwidgets_add_resources(sources xrc/main_frame.xrc) # WXWIDGETS_ADD_RESOURCES(sources xrc/main_frame.xrc)
# wxwidgets_add_resources(sources ${xrc_files} OPTIONS -e -o altname.cxx) # WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o altname.cxx)
# #
function(wxwidgets_add_resources _outfiles) function(WXWIDGETS_ADD_RESOURCES _outfiles)
wx_split_arguments_on(OPTIONS rc_file_list rc_options ${ARGN}) WX_SPLIT_ARGUMENTS_ON(OPTIONS rc_file_list rc_options ${ARGN})
# Parse files for dependencies. # Parse files for dependencies.
set(rc_file_list_abs "") set(rc_file_list_abs "")
@ -1026,7 +1026,7 @@ function(wxwidgets_add_resources _outfiles)
file(READ "${rc_file_abs}" rc_file_contents) file(READ "${rc_file_abs}" rc_file_contents)
# get bitmap/bitmap2 files # get bitmap/bitmap2 files
wx_get_dependencies_from_xml( WX_GET_DEPENDENCIES_FROM_XML(
rc_depends rc_depends
"<bitmap[^<]+" "<bitmap[^<]+"
"^<bitmap[^>]*>" "^<bitmap[^>]*>"
@ -1035,7 +1035,7 @@ function(wxwidgets_add_resources _outfiles)
) )
# get url files # get url files
wx_get_dependencies_from_xml( WX_GET_DEPENDENCIES_FROM_XML(
rc_depends rc_depends
"<url[^<]+" "<url[^<]+"
"^<url[^>]*>" "^<url[^>]*>"
@ -1044,7 +1044,7 @@ function(wxwidgets_add_resources _outfiles)
) )
# get wxIcon files # get wxIcon files
wx_get_dependencies_from_xml( WX_GET_DEPENDENCIES_FROM_XML(
rc_depends rc_depends
"<object[^>]*class=\"wxIcon\"[^<]+" "<object[^>]*class=\"wxIcon\"[^<]+"
"^<object[^>]*>" "^<object[^>]*>"