CMake: fix and add more options

Don't overwrite options in setup.cmake.
Align text in summary message.

Always set wxUSE_XRC to values of wxUSE_XRC, same as in setup.h.
Disable wxUSE_XRC when expat is disabled.

build/cmake/init.cmake

@@ -119,18 +119,24 @@ set(wxUSE_STD_DEFAULT ON)
 if(wxUSE_UNICODE)
     set(wxUSE_WCHAR_T ON)
 endif()
-if(wxUSE_EXPAT)
-    set(wxUSE_XML ON)
-else()
-    set(wxUSE_XML OFF)
+if(NOT wxUSE_EXPAT)
+    set(wxUSE_XRC OFF)
 endif()
+set(wxUSE_XML ${wxUSE_XRC})
 if(wxUSE_CONFIG)
     set(wxUSE_CONFIG_NATIVE ON)
 endif()
 
 if(DEFINED wxUSE_OLE AND wxUSE_OLE)
     set(wxUSE_OLE_AUTOMATION ON)
-    set(wxUSE_ACTIVEX ON)
+endif()
+
+if(DEFINED wxUSE_GRAPHICS_DIRECT2D AND NOT wxUSE_GRAPHICS_CONTEXT)
+    set(wxUSE_GRAPHICS_DIRECT2D OFF)
+endif()
+
+if(wxUSE_OPENGL)
+    set(wxUSE_GLCANVAS ON)
 endif()
 
 if(wxUSE_THREADS)
@@ -138,22 +144,11 @@ if(wxUSE_THREADS)
 endif()
 
 if(wxUSE_GUI)
-    # Constants for GUI
-    set(wxUSE_COMMON_DIALOGS ON)
-
-    if(wxUSE_TASKBARICON)
-        set(wxUSE_TASKBARICON_BALLOONS ON)
-    endif()
-
     if(WIN32 AND wxUSE_METAFILE)
         # this one should probably be made separately configurable
         set(wxUSE_ENH_METAFILE ON)
     endif()
 
-    if(wxUSE_IMAGE)
-        set(wxUSE_WXDIB ON)
-    endif()
-
     if(wxUSE_OPENGL)
         find_package(OpenGL)
         if(NOT OPENGL_FOUND)