CMake: Set wx-config name variables

build/cmake/config.cmake

@@ -42,16 +42,11 @@ 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")
+    set(exec_prefix "\${prefix}")
+    set(includedir "\${prefix}/include")
+    set(libdir "\${exec_prefix}/lib")
+    set(bindir "\${exec_prefix}/bin")
 
     find_program(EGREP egrep)
     mark_as_advanced(EGREP)
@@ -68,8 +63,10 @@ function(wx_write_config)
     endif()
     if(wxUSE_UNICODE)
         set(WX_CHARTYPE unicode)
+        set(lib_unicode_suffix u)
     else()
         set(WX_CHARTYPE ansi)
+        set(lib_unicode_suffix)
     endif()
     if(CMAKE_CROSSCOMPILING)
         set(cross_compiling yes)
@@ -107,10 +104,9 @@ function(wx_write_config)
     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(TOOLCHAIN_NAME "${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}-${WX_RELEASE}")
+    set(WX_LIBRARY_BASENAME_GUI "wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}")
+    set(WX_LIBRARY_BASENAME_NOGUI "wx_base${lib_unicode_suffix}")
 
     set(WXCONFIG_LIBS)
     set(EXTRALIBS_GUI)