CMake: Reorder items in config.cmake

Group similar items together.
This commit is contained in:
Maarten Bent
2018-12-06 22:32:44 +01:00
parent 8cf2b683be
commit bc4b56bf88

View File

@@ -43,74 +43,82 @@ endfunction()
function(wx_write_config)
# TODO: set variables
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix $)
wx_string_append(exec_prefix "{prefix}")
set(includedir "$")
wx_string_append(includedir "{prefix}/include")
set(libdir "$")
wx_string_append(libdir "{exec_prefix}/lib")
set(bindir "$")
wx_string_append(bindir "{exec_prefix}/bin")
if(CMAKE_CROSSCOMPILING)
set(cross_compiling yes)
else()
set(cross_compiling no)
endif()
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix $)
wx_string_append(exec_prefix "{prefix}")
set(BUILT_WX_LIBS)
foreach(lib IN LISTS wxLIB_TARGETS)
wx_string_append(BUILT_WX_LIBS " ${lib}")
endforeach()
set(CC ${CMAKE_C_COMPILER})
set(CXX ${CMAKE_CXX_COMPILER})
set(DMALLOC_LIBS)
find_program(EGREP egrep)
mark_as_advanced(EGREP)
set(EXTRALIBS_GUI)
set(EXTRALIBS_HTML)
set(EXTRALIBS_SDL)
set(EXTRALIBS_STC)
set(EXTRALIBS_WEBVIEW)
set(EXTRALIBS_XML)
set(LDFLAGS_GL)
if(wxBUILD_MONOLITHIC)
set(MONOLITHIC 1)
else()
set(MONOLITHIC 0)
endif()
set(OPENGL_LIBS)
set(RESCOMP)
if(wxBUILD_SHARED)
set(SHARED 1)
else()
set(SHARED 0)
endif()
set(STD_BASE_LIBS)
set(STD_GUI_LIBS)
#TODO: setting TOOLCHAIN_NAME produces change results in config folder
# set(TOOLCHAIN_NAME)
set(TOOLKIT_DIR ${wxBUILD_TOOLKIT})
set(TOOLKIT_VERSION)
set(WIDGET_SET ${wxBUILD_WIDGETSET})
if(wxUSE_UNICODE)
set(WX_CHARTYPE unicode)
else()
set(WX_CHARTYPE ansi)
endif()
if(CMAKE_CROSSCOMPILING)
set(cross_compiling yes)
set(host_alias ${CMAKE_SYSTEM_NAME})
else()
set(cross_compiling no)
endif()
set(BUILT_WX_LIBS)
foreach(lib IN LISTS wxLIB_TARGETS)
wx_string_append(BUILT_WX_LIBS " ${lib}")
endforeach()
set(STD_BASE_LIBS)
set(STD_GUI_LIBS)
set(WX_RELEASE ${wxMAJOR_VERSION}.${wxMINOR_VERSION})
set(WX_VERSION ${wxVERSION})
set(WX_SUBVERSION ${wxVERSION}.0)
set(WX_FLAVOUR)
set(TOOLKIT_DIR ${wxBUILD_TOOLKIT})
set(TOOLKIT_VERSION)
set(WIDGET_SET ${wxBUILD_WIDGETSET})
#TODO: setting TOOLCHAIN_NAME produces change results in config folder
# set(TOOLCHAIN_NAME)
set(WX_LIBRARY_BASENAME_GUI)
set(WX_LIBRARY_BASENAME_NOGUI)
set(WX_RELEASE ${wxMAJOR_VERSION}.${wxMINOR_VERSION})
set(WX_SUBVERSION ${wxVERSION}.0)
set(WX_VERSION ${wxVERSION})
set(WXCONFIG_LIBS)
set(EXTRALIBS_GUI)
set(EXTRALIBS_SDL)
set(EXTRALIBS_HTML)
set(EXTRALIBS_STC)
set(EXTRALIBS_WEBVIEW)
set(EXTRALIBS_XML)
set(EXTRALIBS_MEDIA)
set(OPENGL_LIBS)
set(DMALLOC_LIBS)
set(CC ${CMAKE_C_COMPILER})
set(CXX ${CMAKE_CXX_COMPILER})
set(WXCONFIG_CFLAGS)
set(WXCONFIG_LDFLAGS)
set(WXCONFIG_CPPFLAGS)
set(WXCONFIG_CXXFLAGS)
set(WXCONFIG_LDFLAGS)
set(WXCONFIG_LDFLAGS_GUI)
set(WXCONFIG_LIBS)
set(WXCONFIG_RESFLAGS)
set(WXCONFIG_RPATH)
set(LDFLAGS_GL)
set(RESCOMP)
wx_configure_script(
"${CMAKE_CURRENT_SOURCE_DIR}/wx-config.in"