Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Set wx-config name variables

Browse Source
This commit is contained in:
Maarten Bent
2018-12-06 22:36:57 +01:00
parent 33a550d97f
commit 12ed604cb3
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
build/cmake/config.cmake
View File

@@ -42,16 +42,11 @@ endfunction()
function(wx_write_config) function(wx_write_config)
# TODO: set variables
set(prefix ${CMAKE_INSTALL_PREFIX}) set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix $) set(exec_prefix "\${prefix}")
wx_string_append(exec_prefix "{prefix}") set(includedir "\${prefix}/include")
set(includedir "$") set(libdir "\${exec_prefix}/lib")
wx_string_append(includedir "{prefix}/include") set(bindir "\${exec_prefix}/bin")
set(libdir "$")
wx_string_append(libdir "{exec_prefix}/lib")
set(bindir "$")
wx_string_append(bindir "{exec_prefix}/bin")
find_program(EGREP egrep) find_program(EGREP egrep)
mark_as_advanced(EGREP) mark_as_advanced(EGREP)
@@ -68,8 +63,10 @@ function(wx_write_config)
endif() endif()
if(wxUSE_UNICODE) if(wxUSE_UNICODE)
set(WX_CHARTYPE unicode) set(WX_CHARTYPE unicode)
set(lib_unicode_suffix u)
else() else()
set(WX_CHARTYPE ansi) set(WX_CHARTYPE ansi)
set(lib_unicode_suffix)
endif() endif()
if(CMAKE_CROSSCOMPILING) if(CMAKE_CROSSCOMPILING)
set(cross_compiling yes) set(cross_compiling yes)
@@ -107,10 +104,9 @@ function(wx_write_config)
set(TOOLKIT_DIR ${wxBUILD_TOOLKIT}) set(TOOLKIT_DIR ${wxBUILD_TOOLKIT})
set(TOOLKIT_VERSION) set(TOOLKIT_VERSION)
set(WIDGET_SET ${wxBUILD_WIDGETSET}) set(WIDGET_SET ${wxBUILD_WIDGETSET})
#TODO: setting TOOLCHAIN_NAME produces change results in config folder set(TOOLCHAIN_NAME "${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}-${WX_RELEASE}")
# set(TOOLCHAIN_NAME) set(WX_LIBRARY_BASENAME_GUI "wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}")
set(WX_LIBRARY_BASENAME_GUI) set(WX_LIBRARY_BASENAME_NOGUI "wx_base${lib_unicode_suffix}")
set(WX_LIBRARY_BASENAME_NOGUI)
set(WXCONFIG_LIBS) set(WXCONFIG_LIBS)
set(EXTRALIBS_GUI) set(EXTRALIBS_GUI)