diff --git a/3d-viewer/CMakeLists.txt b/3d-viewer/CMakeLists.txt
index 732a745fac..9350c8a2f4 100644
--- a/3d-viewer/CMakeLists.txt
+++ b/3d-viewer/CMakeLists.txt
@@ -1,8 +1,7 @@
 add_definitions(-DPCBNEW)
 
-include_directories(
-    ../pcbnew
-    ../polygon)
+include_directories(../pcbnew
+                    ../polygon)
 
 set(3D-VIEWER_SRCS
     3d_aux.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 666e4fd725..b8fb411732 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,10 @@
 project(kicad)
 
-if(NOT APPLE)
-    cmake_minimum_required(VERSION 2.4.6 FATAL_ERROR)
-else(NOT APPLE)
+if(WIN32)
+    cmake_minimum_required(VERSION 2.6.1 FATAL_ERROR)
+else(WIN32)
     cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
-endif(NOT APPLE)
+endif(WIN32)
 
 # Path to local CMake modules.
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
@@ -23,7 +23,6 @@ option(KICAD_MINIZIP "enable/disable building minizip (default ON)" ON)
 #================================================
 
 if(CMAKE_COMPILER_IS_GNUCXX)
-
     # Set default flags for Release build.
     set(CMAKE_C_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
     set(CMAKE_CXX_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
@@ -32,7 +31,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     # Set default flags for Debug build.
     set(CMAKE_C_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")
     set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")
-
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
 # Locations for install targets.
@@ -51,21 +49,25 @@ endif(UNIX)
 
 if(WIN32)
     # Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
-    set(CMAKE_INSTALL_PREFIX c:/kicad CACHE PATH "")
+    set(CMAKE_INSTALL_PREFIX c:/kicad
+        CACHE PATH "")
     # Everything without leading / is relative to CMAKE_INSTALL_PREFIX.
-    set(KICAD_PLUGINS ${KICAD_BIN}/plugins CACHE PATH "Location of KiCad plugins.")
-    set(KICAD_DATA share CACHE PATH "Location of KiCad data files.")
-    set(KICAD_DOCS doc CACHE PATH "Location of KiCad documentation files.")
+    set(KICAD_PLUGINS ${KICAD_BIN}/plugins
+        CACHE PATH "Location of KiCad plugins.")
+    set(KICAD_DATA share
+        CACHE PATH "Location of KiCad data files.")
+    set(KICAD_DOCS doc
+        CACHE PATH "Location of KiCad documentation files.")
 endif(WIN32)
 
-set(KICAD_DEMOS ${KICAD_DATA}/demos 
+set(KICAD_DEMOS ${KICAD_DATA}/demos
     CACHE PATH "Location of KiCad demo files.")
-set(KICAD_INTERNAT ${KICAD_DATA}/internat 
+set(KICAD_INTERNAT ${KICAD_DATA}/internat
     CACHE PATH "Location of KiCad i18n files.")
 set(KICAD_TEMPLATE ${KICAD_DATA}/template
     CACHE PATH "Location of KiCad template files.")
 
-mark_as_advanced(KICAD_BIN 
+mark_as_advanced(KICAD_BIN
                  KICAD_PLUGINS
                  KICAD_DATA
                  KICAD_DOCS
@@ -83,13 +85,13 @@ include(CheckFindPackageResult)
 #######################
 # Find OpenGL library #
 #######################
-find_package(OpenGL)
+find_package(OpenGL QUIET)
 check_find_package_result(OPENGL_FOUND "OpenGL")
 
 ######################
 # Find Boost library #
 ######################
-find_package(Boost)
+find_package(Boost QUIET)
 check_find_package_result(Boost_FOUND "Boost")
 
 ##########################
@@ -98,8 +100,7 @@ check_find_package_result(Boost_FOUND "Boost")
 # Here you can define what libraries of wxWidgets you need for your
 # application. You can figure out what libraries you need here;
 # http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html
-set(wxWidgets_USE_LIBS base core adv gl html net)
-find_package(wxWidgetsCVS)
+find_package(wxWidgets COMPONENTS base core adv gl html net QUIET)
 check_find_package_result(wxWidgets_FOUND "wxWidgets")
 
 
@@ -113,16 +114,16 @@ include(MinGWResourceCompiler)
 # Automagically create version header file.
 # does not work with mingw for me (jpc)
 if(UNIX)
- include(CreateSVNVersionHeader)
- create_svn_version_header()
+    include(CreateSVNVersionHeader)
+    create_svn_version_header()
 endif(UNIX)
 
 if(EXISTS ${CMAKE_SOURCE_DIR}/include/config.h)
- # This file may exist (created by an alternate process to the svn test above),
- # e.g. could be created by a checkout script that produces a source tar file.
- # This directive means the about box will have the svn date & revision in it,
- # but the hard coded release date (program version) will be preserved.
- add_definitions(-DHAVE_SVN_REVISION)
+    # This file may exist (created by an alternate process to the svn test above),
+    # e.g. could be created by a checkout script that produces a source tar file.
+    # This directive means the about box will have the svn date & revision in it,
+    # but the hard coded release date (program version) will be preserved.
+    add_definitions(-DHAVE_SVN_REVISION)
 endif(EXISTS ${CMAKE_SOURCE_DIR}/include/config.h)
 
 
@@ -164,21 +165,20 @@ add_subdirectory(template)
 #================================================
 # Installation parameters
 #================================================
-install(FILES install.txt 
+install(FILES install.txt
         DESTINATION ${KICAD_DOCS}
         COMPONENT resources)
-install(FILES freeroute.jnlp 
+install(FILES freeroute.jnlp
         DESTINATION ${KICAD_BIN}
         COMPONENT resources)
 
 
 if(UNIX)
-
-  # set resource dir variables
-  #set(KICAD_PROGRAM_ICONS ${CMAKE_INSTALL_PREFIX}/share/kicad/icons)
-  set(LINUX_RESOURCES_DIR resources/linux)
-  set(LINUX_DESKTOP_FILES ${LINUX_RESOURCES_DIR}/opendesktop)
-  set(LINUX_DESKTOP_ICONS ${LINUX_RESOURCES_DIR}/icons)
+    # set resource dir variables
+    #set(KICAD_PROGRAM_ICONS ${CMAKE_INSTALL_PREFIX}/share/kicad/icons)
+    set(LINUX_RESOURCES_DIR resources/linux)
+    set(LINUX_DESKTOP_FILES ${LINUX_RESOURCES_DIR}/opendesktop)
+    set(LINUX_DESKTOP_ICONS ${LINUX_RESOURCES_DIR}/icons)
 
 
     # Install program icons
@@ -236,5 +236,4 @@ if(UNIX)
    install(FILES ${LINUX_DESKTOP_ICONS}/kicad_pcbnew.png
            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
            COMPONENT resources)
-
 endif(UNIX)
diff --git a/CMakeModules/CreateSVNVersionHeader.cmake b/CMakeModules/CreateSVNVersionHeader.cmake
index afe756543b..9e4f718998 100644
--- a/CMakeModules/CreateSVNVersionHeader.cmake
+++ b/CMakeModules/CreateSVNVersionHeader.cmake
@@ -1,10 +1,10 @@
 macro(create_svn_version_header)
     # Include Subversion support to automagically create version header file.
-    find_package(SubversionCVS)
+    find_package(Subversion)
     if(Subversion_FOUND)
         Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Kicad)
         string(REGEX REPLACE "^([0-9]+)\\-([0-9]+)\\-([0-9]+).*" "\\1\\2\\3"
-            _kicad_svn_date ${Kicad_WC_LAST_CHANGED_DATE})
+               _kicad_svn_date ${Kicad_WC_LAST_CHANGED_DATE})
         set(KICAD_SVN_VERSION
             "(${_kicad_svn_date} SVN-R${Kicad_WC_LAST_CHANGED_REV})")
         set(KICAD_ABOUT_VERSION
@@ -20,6 +20,6 @@ macro(create_svn_version_header)
 
         # Generate config.h.
         configure_file(${CMAKE_SOURCE_DIR}/CMakeModules/config.h.cmake
-            ${CMAKE_BINARY_DIR}/config.h)
+                       ${CMAKE_BINARY_DIR}/config.h)
     endif(Subversion_FOUND)
 endmacro(create_svn_version_header)
diff --git a/CMakeModules/FindPackageHandleStandardArgs.cmake b/CMakeModules/FindPackageHandleStandardArgs.cmake
deleted file mode 100644
index 7dc5a6d213..0000000000
--- a/CMakeModules/FindPackageHandleStandardArgs.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-# CMake CVS r1.3
-
-# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME (DEFAULT_MSG|"Custom failure message") VAR1 ... )
-#    This macro is intended to be used in FindXXX.cmake modules files.
-#    It handles the REQUIRED and QUIET argument to FIND_PACKAGE() and
-#    it also sets the <UPPERCASED_NAME>_FOUND variable.
-#    The package is found if all variables listed are TRUE.
-#    Example:
-#
-#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)
-#
-#    LibXml2 is considered to be found, if both LIBXML2_LIBRARIES and 
-#    LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE.
-#    If it is not found and REQUIRED was used, it fails with FATAL_ERROR, 
-#    independent whether QUIET was used or not.
-#    If it is found, the location is reported using the VAR1 argument, so 
-#    here a message "Found LibXml2: /usr/lib/libxml2.so" will be printed out.
-#    If the second argument is DEFAULT_MSG, the message in the failure case will 
-#    be "Could NOT find LibXml2", if you don't like this message you can specify
-#    your own custom failure message there.
-
-MACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 )
-
-  IF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
-    SET(_FAIL_MESSAGE "Could NOT find ${_NAME}")
-  ELSE("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
-    SET(_FAIL_MESSAGE "${_FAIL_MSG}")
-  ENDIF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
-
-  STRING(TOUPPER ${_NAME} _NAME_UPPER)
-
-  SET(${_NAME_UPPER}_FOUND TRUE)
-  IF(NOT ${_VAR1})
-    SET(${_NAME_UPPER}_FOUND FALSE)
-  ENDIF(NOT ${_VAR1})
-
-  FOREACH(_CURRENT_VAR ${ARGN})
-    IF(NOT ${_CURRENT_VAR})
-      SET(${_NAME_UPPER}_FOUND FALSE)
-    ENDIF(NOT ${_CURRENT_VAR})
-  ENDFOREACH(_CURRENT_VAR)
-
-  IF (${_NAME_UPPER}_FOUND)
-#     IF (NOT ${_NAME}_FIND_QUIETLY)
-#         MESSAGE(STATUS "Found ${_NAME}: ${${_VAR1}}")
-#     ENDIF (NOT ${_NAME}_FIND_QUIETLY)
-  ELSE (${_NAME_UPPER}_FOUND)
-    IF (${_NAME}_FIND_REQUIRED)
-        MESSAGE(FATAL_ERROR "${_FAIL_MESSAGE}")
-    ELSE (${_NAME}_FIND_REQUIRED)
-      IF (NOT ${_NAME}_FIND_QUIETLY)
-        MESSAGE(STATUS "${_FAIL_MESSAGE}")
-      ENDIF (NOT ${_NAME}_FIND_QUIETLY)
-    ENDIF (${_NAME}_FIND_REQUIRED)
-  ENDIF (${_NAME_UPPER}_FOUND)
-ENDMACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS)
diff --git a/CMakeModules/FindSubversionCVS.cmake b/CMakeModules/FindSubversion.cmake
similarity index 86%
rename from CMakeModules/FindSubversionCVS.cmake
rename to CMakeModules/FindSubversion.cmake
index 2b50a704ae..65858fa56e 100644
--- a/CMakeModules/FindSubversionCVS.cmake
+++ b/CMakeModules/FindSubversion.cmake
@@ -1,5 +1,8 @@
-# CMake CVS r1.2.2.2
 #
+# From CMake 2.6.1
+#
+
+# 
 # - Extract information from a subversion working copy
 # The module defines the following variables:
 #  Subversion_SVN_EXECUTABLE - path to svn command line client
@@ -22,6 +25,8 @@
 #  IF(Subversion_FOUND)
 #    Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
 #    MESSAGE("Current revision is ${Project_WC_REVISION}")
+#    Subversion_WC_LOG(${PROJECT_SOURCE_DIR} Project)
+#    MESSAGE("Last changed log is ${Project_LAST_CHANGED_LOG}")
 #  ENDIF(Subversion_FOUND)
 
 # Copyright (c) 2006, Tristan Carel
@@ -49,17 +54,11 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# $Id: FindSubversion.cmake,v 1.2.2.2 2008/03/26 18:08:24 hoffman Exp $
+# $Id: FindSubversion.cmake,v 1.2.2.3 2008-05-23 20:09:34 hoffman Exp $
 
 SET(Subversion_FOUND FALSE)
 SET(Subversion_SVN_FOUND FALSE)
 
-# the subversion commands should be executed with the C locale, otherwise
-# the message (which are parsed) may be translated, Alex
-SET(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}" )
-SET(ENV{LC_ALL} C)
-SET(ENV{LANG} C)
-
 FIND_PROGRAM(Subversion_SVN_EXECUTABLE svn
   DOC "subversion command line client")
 MARK_AS_ADVANCED(Subversion_SVN_EXECUTABLE)
@@ -69,6 +68,11 @@ IF(Subversion_SVN_EXECUTABLE)
   SET(Subversion_FOUND TRUE)
 
   MACRO(Subversion_WC_INFO dir prefix)
+    # the subversion commands should be executed with the C locale, otherwise
+    # the message (which are parsed) may be translated, Alex
+    SET(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}")
+    SET(ENV{LC_ALL} C)
+
     EXECUTE_PROCESS(COMMAND ${Subversion_SVN_EXECUTABLE} --version
       WORKING_DIRECTORY ${dir}
       OUTPUT_VARIABLE Subversion_VERSION_SVN
@@ -99,9 +103,19 @@ IF(Subversion_SVN_EXECUTABLE)
 
     ENDIF(NOT ${Subversion_svn_info_result} EQUAL 0)
 
+    # restore the previous LC_ALL
+    SET(ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL})
+
+  ENDMACRO(Subversion_WC_INFO)
+
+  MACRO(Subversion_WC_LOG dir prefix)
+    # This macro can block if the certificate is not signed:
+    # svn ask you to accept the certificate and wait for your answer
+    # This macro requires a svn server network access (Internet most of the time)
+    # and can also be slow since it access the svn server
     EXECUTE_PROCESS(COMMAND
       ${Subversion_SVN_EXECUTABLE} log -r BASE ${dir}
-      OUTPUT_VARIABLE Subversion_LAST_CHANGED_LOG
+      OUTPUT_VARIABLE ${prefix}_LAST_CHANGED_LOG
       ERROR_VARIABLE Subversion_svn_log_error
       RESULT_VARIABLE Subversion_svn_log_result
       OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -109,13 +123,10 @@ IF(Subversion_SVN_EXECUTABLE)
     IF(NOT ${Subversion_svn_log_result} EQUAL 0)
       MESSAGE(SEND_ERROR "Command \"${Subversion_SVN_EXECUTABLE} log -r BASE ${dir}\" failed with output:\n${Subversion_svn_log_error}")
     ENDIF(NOT ${Subversion_svn_log_result} EQUAL 0)
-  ENDMACRO(Subversion_WC_INFO)
+  ENDMACRO(Subversion_WC_LOG)
 
 ENDIF(Subversion_SVN_EXECUTABLE)
 
-# restore the previous LC_ALL
-SET(ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL})
-
 IF(NOT Subversion_FOUND)
   IF(NOT Subversion_FIND_QUIETLY)
     MESSAGE(STATUS "Subversion was not found.")
diff --git a/CMakeModules/FindwxWidgetsCVS.cmake b/CMakeModules/FindwxWidgetsCVS.cmake
deleted file mode 100644
index fd7b695906..0000000000
--- a/CMakeModules/FindwxWidgetsCVS.cmake
+++ /dev/null
@@ -1,962 +0,0 @@
-# CMake CVS r1.17 + CMake 2.4 compatibility fixes
-
-# - Find a wxWidgets (a.k.a., wxWindows) installation.
-# This module finds if wxWidgets is installed and selects a default
-# configuration to use. wxWidgets is a modular library. To specify the
-# modules that you will use, you need to name them as components to
-# the package:
-#
-# FIND_PACKAGE(wxWidgets COMPONENTS base core ...)
-#
-# There are two search branches: a windows style and a unix style. For
-# windows, the following variables are searched for and set to
-# defaults in case of multiple choices. Change them if the defaults
-# are not desired (i.e., these are the only variables you should
-# change to select a configuration):
-#
-#  wxWidgets_ROOT_DIR      - Base wxWidgets directory
-#                            (e.g., C:/wxWidgets-2.6.3).
-#  wxWidgets_LIB_DIR       - Path to wxWidgets libraries
-#                            (e.g., C:/wxWidgets-2.6.3/lib/vc_lib).
-#  wxWidgets_CONFIGURATION - Configuration to use
-#                            (e.g., msw, mswd, mswu, mswunivud, etc.)
-#
-# For unix style it uses the wx-config utility. You can select between
-# debug/release, unicode/ansi, universal/non-universal, and
-# static/shared in the QtDialog or ccmake interfaces by turning ON/OFF
-# the following variables:
-#
-#  wxWidgets_USE_DEBUG
-#  wxWidgets_USE_UNICODE
-#  wxWidgets_USE_UNIVERSAL
-#  wxWidgets_USE_STATIC
-#
-# The following are set after the configuration is done for both
-# windows and unix style:
-#
-#  wxWidgets_FOUND            - Set to TRUE if wxWidgets was found.
-#  wxWidgets_INCLUDE_DIRS     - Include directories for WIN32
-#                               i.e., where to find "wx/wx.h" and
-#                               "wx/setup.h"; possibly empty for unices.
-#  wxWidgets_LIBRARIES        - Path to the wxWidgets libraries.
-#  wxWidgets_LIBRARY_DIRS     - compile time link dirs, useful for
-#                               rpath on UNIX. Typically an empty string
-#                               in WIN32 environment.
-#  wxWidgets_DEFINITIONS      - Contains defines required to compile/link
-#                               against WX, e.g. -DWXUSINGDLL
-#  wxWidgets_CXX_FLAGS        - Include dirs and ompiler flags for
-#                               unices, empty on WIN32. Esentially
-#                               "`wx-config --cxxflags`".
-#  wxWidgets_USE_FILE         - Convenience include file.
-#
-# Sample usage:
-#   FIND_PACKAGE(wxWidgets COMPONENTS base core gl net)
-#   IF(wxWidgets_FOUND)
-#     INCLUDE(${wxWidgets_USE_FILE})
-#     # and for each of your dependant executable/library targets:
-#     TARGET_LINK_LIBRARIES(<YourTarget> ${wxWidgets_LIBRARIES})
-#   ENDIF(wxWidgets_FOUND)
-#
-# If wxWidgets is required (i.e., not an optional part):
-#   FIND_PACKAGE(wxWidgets REQUIRED base core gl net)
-#   INCLUDE(${wxWidgets_USE_FILE})
-#   # and for each of your dependant executable/library targets:
-#   TARGET_LINK_LIBRARIES(<YourTarget> ${wxWidgets_LIBRARIES})
-
-#
-# FIXME: check this and provide a correct sample usage...
-#        Remember to connect back to the upper text.
-# Sample usage with monolithic wx build:
-#
-#   FIND_PACKAGE(wxWidgets COMPONENTS mono)
-#   ...
-
-
-# NOTES
-#
-# This module has been tested on the WIN32 platform with wxWidgets
-# 2.6.2, 2.6.3, and 2.5.3. However, it has been designed to
-# easily extend support to all possible builds, e.g., static/shared,
-# debug/release, unicode, universal, multilib/monolithic, etc..
-#
-# If you want to use the module and your build type is not supported
-# out-of-the-box, please contact me to exchange information on how
-# your system is setup and I'll try to add support for it.
-#
-# AUTHOR
-#
-# Miguel A. Figueroa-Villanueva (miguelf at ieee dot org).
-# Jan Woetzel (jw at mip.informatik.uni-kiel.de).
-#
-# Based on previous works of:
-# Jan Woetzel (FindwxWindows.cmake),
-# Jorgen Bodde and Jerry Fath (FindwxWin.cmake).
-
-# TODO/ideas
-#
-# (1) Option/Setting to use all available wx libs
-# In contrast to expert developer who lists the
-# minimal set of required libs in wxWidgets_USE_LIBS
-# there is the newbie user:
-#   - who just wants to link against WX with more 'magic'
-#   - doesn't know the internal structure of WX or how it was built,
-#     in particular if it is monolithic or not
-#   - want to link against all available WX libs
-# Basically, the intent here is to mimic what wx-config would do by
-# default (i.e., `wx-config --libs`).
-#
-# Possible solution:
-#   Add a reserved keyword "std" that initializes to what wx-config
-# would default to. If the user has not set the wxWidgets_USE_LIBS,
-# default to "std" instead of "base core" as it is now. To implement
-# "std" will basically boil down to a FOR_EACH lib-FOUND, but maybe
-# checking whether a minimal set was found.
-
-
-# FIXME: This and all the DBG_MSG calls should be removed after the
-# module stabilizes.
-#
-# Helper macro to control the debugging output globally. There are
-# two versions for controlling how verbose your output should be.
-MACRO(DBG_MSG _MSG)
-#  MESSAGE(STATUS
-#    "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
-ENDMACRO(DBG_MSG)
-MACRO(DBG_MSG_V _MSG)
-#  MESSAGE(STATUS
-#    "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
-ENDMACRO(DBG_MSG_V)
-
-# Clear return values in case the module is loaded more than once.
-SET(wxWidgets_FOUND FALSE)
-SET(wxWidgets_INCLUDE_DIRS "")
-SET(wxWidgets_LIBRARIES    "")
-SET(wxWidgets_LIBRARY_DIRS "")
-SET(wxWidgets_CXX_FLAGS    "")
-
-# DEPRECATED: This is a patch to support the DEPRECATED use of
-# wxWidgets_USE_LIBS.
-#
-# If wxWidgets_USE_LIBS is set:
-# - if using <components>, then override wxWidgets_USE_LIBS
-# - else set wxWidgets_FIND_COMPONENTS to wxWidgets_USE_LIBS
-IF(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS)
-  SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_USE_LIBS})
-ENDIF(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS)
-DBG_MSG("wxWidgets_FIND_COMPONENTS : ${wxWidgets_FIND_COMPONENTS}")
-
-# Add the convenience use file if available.
-#
-# Get dir of this file which may reside in:
-# - CMAKE_MAKE_ROOT/Modules on CMake installation
-# - CMAKE_MODULE_PATH if user prefers his own specialized version
-SET(wxWidgets_USE_FILE "")
-GET_FILENAME_COMPONENT(
-  wxWidgets_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
-# Prefer an existing customized version, but the user might override
-# the FindwxWidgets module and not the UsewxWidgets one.
-IF(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
-  SET(wxWidgets_USE_FILE
-    "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
-ELSE(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
-  SET(wxWidgets_USE_FILE UsewxWidgets.cmake)
-ENDIF(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
-
-#=====================================================================
-#=====================================================================
-IF(WIN32)
-  SET(WIN32_STYLE_FIND 1)
-ENDIF(WIN32)
-IF(MINGW)
-  SET(WIN32_STYLE_FIND 0)
-  SET(UNIX_STYLE_FIND 1)
-ENDIF(MINGW)
-IF(UNIX)
-  SET(UNIX_STYLE_FIND 1)
-ENDIF(UNIX)
-
-#=====================================================================
-# WIN32_STYLE_FIND
-#=====================================================================
-IF(WIN32_STYLE_FIND)
-  # Useful common wx libs needed by almost all components.
-  SET(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
-
-  # DEPRECATED: Use FIND_PACKAGE(wxWidgets COMPONENTS mono) instead.
-  IF(NOT wxWidgets_FIND_COMPONENTS)
-    IF(wxWidgets_USE_MONOLITHIC)
-      SET(wxWidgets_FIND_COMPONENTS mono)
-    ELSE(wxWidgets_USE_MONOLITHIC)
-      SET(wxWidgets_FIND_COMPONENTS base core) # this is default
-    ENDIF(wxWidgets_USE_MONOLITHIC)
-  ENDIF(NOT wxWidgets_FIND_COMPONENTS)
-
-  # Always add the common required libs.
-  LIST(APPEND wxWidgets_FIND_COMPONENTS ${wxWidgets_COMMON_LIBRARIES})
-
-  #-------------------------------------------------------------------
-  # WIN32: Helper MACROS
-  #-------------------------------------------------------------------
-  #
-  # Get filename components for a configuration. For example,
-  #   if _CONFIGURATION = mswunivud, then _UNV=univ, _UCD=u _DBG=d
-  #   if _CONFIGURATION = mswu,      then _UNV="",   _UCD=u _DBG=""
-  #
-  MACRO(WX_GET_NAME_COMPONENTS _CONFIGURATION _UNV _UCD _DBG)
-    STRING(REGEX MATCH "univ" ${_UNV} "${_CONFIGURATION}")
-    STRING(REGEX REPLACE "msw.*(u)[d]*$" "u" ${_UCD} "${_CONFIGURATION}")
-    IF(${_UCD} STREQUAL ${_CONFIGURATION})
-      SET(${_UCD} "")
-    ENDIF(${_UCD} STREQUAL ${_CONFIGURATION})
-    STRING(REGEX MATCH "d$" ${_DBG} "${_CONFIGURATION}")
-  ENDMACRO(WX_GET_NAME_COMPONENTS)
-
-  #
-  # Find libraries associated to a configuration.
-  #
-  MACRO(WX_FIND_LIBS _UNV _UCD _DBG)
-    DBG_MSG_V("m_unv = ${_UNV}")
-    DBG_MSG_V("m_ucd = ${_UCD}")
-    DBG_MSG_V("m_dbg = ${_DBG}")
-
-    # FIXME: What if both regex libs are available. regex should be
-    # found outside the loop and only wx${LIB}${_UCD}${_DBG}.
-    # Find wxWidgets common libraries.
-    FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES})
-      FIND_LIBRARY(WX_${LIB}${_DBG}
-        NAMES
-        wx${LIB}${_UCD}${_DBG} # for regex
-        wx${LIB}${_DBG}
-        PATHS ${WX_LIB_DIR}
-        NO_DEFAULT_PATH
-        )
-      MARK_AS_ADVANCED(WX_${LIB}${_DBG})
-    ENDFOREACH(LIB)
-
-    # Find wxWidgets multilib base libraries.
-    FIND_LIBRARY(WX_base${_DBG}
-      NAMES
-      wxbase29${_UCD}${_DBG}
-      wxbase28${_UCD}${_DBG}
-      wxbase27${_UCD}${_DBG}
-      wxbase26${_UCD}${_DBG}
-      wxbase25${_UCD}${_DBG}
-      PATHS ${WX_LIB_DIR}
-      NO_DEFAULT_PATH
-      )
-    MARK_AS_ADVANCED(WX_base${_DBG})
-    FOREACH(LIB net odbc xml)
-      FIND_LIBRARY(WX_${LIB}${_DBG}
-        NAMES
-        wxbase29${_UCD}${_DBG}_${LIB}
-        wxbase28${_UCD}${_DBG}_${LIB}
-        wxbase27${_UCD}${_DBG}_${LIB}
-        wxbase26${_UCD}${_DBG}_${LIB}
-        wxbase25${_UCD}${_DBG}_${LIB}
-        PATHS ${WX_LIB_DIR}
-        NO_DEFAULT_PATH
-        )
-      MARK_AS_ADVANCED(WX_${LIB}${_DBG})
-    ENDFOREACH(LIB)
-
-    # Find wxWidgets monolithic library.
-    FIND_LIBRARY(WX_mono${_DBG}
-      NAMES
-      wxmsw${_UNV}29${_UCD}${_DBG}
-      wxmsw${_UNV}28${_UCD}${_DBG}
-      wxmsw${_UNV}27${_UCD}${_DBG}
-      wxmsw${_UNV}26${_UCD}${_DBG}
-      wxmsw${_UNV}25${_UCD}${_DBG}
-      PATHS ${WX_LIB_DIR}
-      NO_DEFAULT_PATH
-      )
-    MARK_AS_ADVANCED(WX_mono${_DBG})
-
-    # Find wxWidgets multilib libraries.
-    FOREACH(LIB core adv aui html media xrc dbgrid gl qa)
-      FIND_LIBRARY(WX_${LIB}${_DBG}
-        NAMES
-        wxmsw${_UNV}29${_UCD}${_DBG}_${LIB}
-        wxmsw${_UNV}28${_UCD}${_DBG}_${LIB}
-        wxmsw${_UNV}27${_UCD}${_DBG}_${LIB}
-        wxmsw${_UNV}26${_UCD}${_DBG}_${LIB}
-        wxmsw${_UNV}25${_UCD}${_DBG}_${LIB}
-        PATHS ${WX_LIB_DIR}
-        NO_DEFAULT_PATH
-        )
-      MARK_AS_ADVANCED(WX_${LIB}${_DBG})
-    ENDFOREACH(LIB)
-  ENDMACRO(WX_FIND_LIBS)
-
-  #
-  # Clear all library paths, so that FIND_LIBRARY refinds them.
-  #
-  # Clear a lib, reset its found flag, and mark as advanced.
-  MACRO(WX_CLEAR_LIB _LIB)
-    SET(${_LIB} "${_LIB}-NOTFOUND" CACHE FILEPATH "Cleared." FORCE)
-    SET(${_LIB}_FOUND FALSE)
-    MARK_AS_ADVANCED(${_LIB})
-  ENDMACRO(WX_CLEAR_LIB)
-  # Clear all debug or release library paths (arguments are "d" or "").
-  MACRO(WX_CLEAR_ALL_LIBS _DBG)
-    # Clear wxWidgets common libraries.
-    FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES})
-      WX_CLEAR_LIB(WX_${LIB}${_DBG})
-    ENDFOREACH(LIB)
-
-    # Clear wxWidgets multilib base libraries.
-    WX_CLEAR_LIB(WX_base${_DBG})
-    FOREACH(LIB net odbc xml)
-      WX_CLEAR_LIB(WX_${LIB}${_DBG})
-    ENDFOREACH(LIB)
-
-    # Clear wxWidgets monolithic library.
-    WX_CLEAR_LIB(WX_mono${_DBG})
-
-    # Clear wxWidgets multilib libraries.
-    FOREACH(LIB core adv aui html media xrc dbgrid gl qa)
-      WX_CLEAR_LIB(WX_${LIB}${_DBG})
-    ENDFOREACH(LIB)
-  ENDMACRO(WX_CLEAR_ALL_LIBS)
-  # Clear all wxWidgets debug libraries.
-  MACRO(WX_CLEAR_ALL_DBG_LIBS)
-    WX_CLEAR_ALL_LIBS("d")
-  ENDMACRO(WX_CLEAR_ALL_DBG_LIBS)
-  # Clear all wxWidgets release libraries.
-  MACRO(WX_CLEAR_ALL_REL_LIBS)
-    WX_CLEAR_ALL_LIBS("")
-  ENDMACRO(WX_CLEAR_ALL_REL_LIBS)
-
-  #
-  # Set the wxWidgets_LIBRARIES variable.
-  # Also, Sets output variable wxWidgets_FOUND to FALSE if it fails.
-  #
-  MACRO(WX_SET_LIBRARIES _LIBS _DBG)
-    DBG_MSG_V("Looking for ${${_LIBS}}")
-    IF(WX_USE_REL_AND_DBG)
-      FOREACH(LIB ${${_LIBS}})
-        DBG_MSG_V("Searching for ${LIB} and ${LIB}d")
-        DBG_MSG_V("WX_${LIB}  : ${WX_${LIB}}")
-        DBG_MSG_V("WX_${LIB}d : ${WX_${LIB}d}")
-        IF(WX_${LIB} AND WX_${LIB}d)
-          DBG_MSG_V("Found ${LIB} and ${LIB}d")
-          LIST(APPEND wxWidgets_LIBRARIES
-            debug ${WX_${LIB}d} optimized ${WX_${LIB}}
-            )
-        ELSE(WX_${LIB} AND WX_${LIB}d)
-          DBG_MSG_V("- not found due to missing WX_${LIB}=${WX_${LIB}} or WX_${LIB}d=${WX_${LIB}d}")
-          SET(wxWidgets_FOUND FALSE)
-        ENDIF(WX_${LIB} AND WX_${LIB}d)
-      ENDFOREACH(LIB)
-    ELSE(WX_USE_REL_AND_DBG)
-      FOREACH(LIB ${${_LIBS}})
-        DBG_MSG_V("Searching for ${LIB}${_DBG}")
-        DBG_MSG_V("WX_${LIB}${_DBG} : ${WX_${LIB}${_DBG}}")
-        IF(WX_${LIB}${_DBG})
-          DBG_MSG_V("Found ${LIB}${_DBG}")
-          LIST(APPEND wxWidgets_LIBRARIES ${WX_${LIB}${_DBG}})
-        ELSE(WX_${LIB}${_DBG})
-          DBG_MSG_V(
-            "- not found due to missing WX_${LIB}${_DBG}=${WX_${LIB}${_DBG}}")
-          SET(wxWidgets_FOUND FALSE)
-        ENDIF(WX_${LIB}${_DBG})
-      ENDFOREACH(LIB)
-    ENDIF(WX_USE_REL_AND_DBG)
-
-    DBG_MSG_V("OpenGL")
-    LIST(FIND ${_LIBS} gl WX_USE_GL)
-    IF(NOT WX_USE_GL EQUAL -1)
-      DBG_MSG_V("- is required.")
-      LIST(APPEND wxWidgets_LIBRARIES opengl32 glu32)
-    ENDIF(NOT WX_USE_GL EQUAL -1)
-
-    LIST(APPEND wxWidgets_LIBRARIES winmm comctl32 rpcrt4 wsock32)
-  ENDMACRO(WX_SET_LIBRARIES)
-
-  #-------------------------------------------------------------------
-  # WIN32: Start actual work.
-  #-------------------------------------------------------------------
-
-  # Look for an installation tree.
-  FIND_PATH(wxWidgets_ROOT_DIR
-    NAMES include/wx/wx.h
-    PATHS
-      $ENV{wxWidgets_ROOT_DIR}
-      $ENV{WXWIN}
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWidgets_is1;Inno Setup: App Path]"  # WX 2.6.x
-      C:/
-      D:/
-      $ENV{ProgramFiles}
-    PATH_SUFFIXES
-      wxWidgets-2.8.8
-      wxWidgets-2.8.7
-      wxWidgets-2.8.6
-      wxWidgets-2.8.5
-      wxWidgets-2.8.4
-      wxWidgets-2.8.3
-      wxWidgets-2.8.2
-      wxWidgets-2.8.1
-      wxWidgets-2.8.0
-      wxWidgets-2.6.3
-      wxWidgets-2.6.2
-      wxWidgets-2.6.1
-      wxWidgets
-    DOC "wxWidgets base/installation directory?"
-    )
-
-  # If wxWidgets_ROOT_DIR changed, clear lib dir.
-  IF(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
-    SET(WX_ROOT_DIR ${wxWidgets_ROOT_DIR}
-        CACHE INTERNAL "wxWidgets_ROOT_DIR")
-    SET(wxWidgets_LIB_DIR "wxWidgets_LIB_DIR-NOTFOUND"
-        CACHE PATH "Cleared." FORCE)
-  ENDIF(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
-
-  IF(WX_ROOT_DIR)
-    # Select one default tree inside the already determined wx tree.
-    # Prefer static/shared order usually consistent with build
-    # settings.
-    IF(BUILD_SHARED_LIBS)
-      FIND_PATH(wxWidgets_LIB_DIR
-        NAMES wxpng.lib wxpngd.lib
-        PATHS
-        ${WX_ROOT_DIR}/lib/vc_dll   # prefer shared
-        ${WX_ROOT_DIR}/lib/vc_lib
-        DOC "Path to wxWidgets libraries?"
-        NO_DEFAULT_PATH
-        )
-    ELSE(BUILD_SHARED_LIBS)
-      FIND_PATH(wxWidgets_LIB_DIR
-        NAMES wxpng.lib wxpngd.lib
-        PATHS
-        ${WX_ROOT_DIR}/lib/vc_lib   # prefer static
-        ${WX_ROOT_DIR}/lib/vc_dll
-        DOC "Path to wxWidgets libraries?"
-        NO_DEFAULT_PATH
-        )
-    ENDIF(BUILD_SHARED_LIBS)
-
-    # If wxWidgets_LIB_DIR changed, clear all libraries.
-    IF(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
-      SET(WX_LIB_DIR ${wxWidgets_LIB_DIR} CACHE INTERNAL "wxWidgets_LIB_DIR")
-      WX_CLEAR_ALL_DBG_LIBS()
-      WX_CLEAR_ALL_REL_LIBS()
-    ENDIF(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
-
-    IF(WX_LIB_DIR)
-      SET(wxWidgets_FOUND TRUE)
-
-      # If building shared libs, define WXUSINGDLL to use dllimport.
-      IF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
-        SET(wxWidgets_DEFINITIONS "-DWXUSINGDLL")
-        DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}")
-      ENDIF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
-
-      # Search for available configuration types.
-      FOREACH(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw)
-        SET(WX_${CFG}_FOUND FALSE)
-        IF(EXISTS ${WX_LIB_DIR}/${CFG})
-          LIST(APPEND WX_CONFIGURATION_LIST ${CFG})
-          SET(WX_${CFG}_FOUND TRUE)
-          SET(WX_CONFIGURATION ${CFG})
-        ENDIF(EXISTS ${WX_LIB_DIR}/${CFG})
-      ENDFOREACH(CFG)
-      DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}")
-
-      IF(WX_CONFIGURATION)
-        # If the selected configuration wasn't found force the default
-        # one. Otherwise, use it but still force a refresh for
-        # updating the doc string with the current list of available
-        # configurations.
-        IF(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
-          SET(wxWidgets_CONFIGURATION ${WX_CONFIGURATION} CACHE STRING
-            "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE)
-        ELSE(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
-          SET(wxWidgets_CONFIGURATION ${wxWidgets_CONFIGURATION} CACHE STRING
-            "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE)
-        ENDIF(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
-
-        # If release config selected, and both release/debug exist.
-        IF(WX_${wxWidgets_CONFIGURATION}d_FOUND)
-          OPTION(wxWidgets_USE_REL_AND_DBG
-            "Use release and debug configurations?" TRUE)
-          SET(WX_USE_REL_AND_DBG ${wxWidgets_USE_REL_AND_DBG})
-        ELSE(WX_${wxWidgets_CONFIGURATION}d_FOUND)
-          # If the option exists (already in cache), force it false.
-          IF(wxWidgets_USE_REL_AND_DBG)
-            SET(wxWidgets_USE_REL_AND_DBG FALSE CACHE BOOL
-              "No ${wxWidgets_CONFIGURATION}d found." FORCE)
-          ENDIF(wxWidgets_USE_REL_AND_DBG)
-          SET(WX_USE_REL_AND_DBG FALSE)
-        ENDIF(WX_${wxWidgets_CONFIGURATION}d_FOUND)
-
-        # Get configuration parameters from the name.
-        WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG)
-
-        # Set wxWidgets main include directory.
-        IF(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
-          SET(wxWidgets_INCLUDE_DIRS ${WX_ROOT_DIR}/include)
-        ELSE(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
-          DBG_MSG("wxWidgets_FOUND FALSE because WX_ROOT_DIR=${WX_ROOT_DIR} has no ${WX_ROOT_DIR}/include/wx/wx.h")
-          SET(wxWidgets_FOUND FALSE)
-        ENDIF(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
-
-        # Set wxWidgets lib setup include directory.
-        IF(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
-          LIST(APPEND wxWidgets_INCLUDE_DIRS
-            ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION})
-        ELSE(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
-          DBG_MSG("WXWIDGET_FOUND FALSE because ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h does not exists.")
-          SET(wxWidgets_FOUND FALSE)
-        ENDIF(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
-
-        # Find wxWidgets libraries.
-        WX_FIND_LIBS("${UNV}" "${UCD}" "${DBG}")
-        IF(WX_USE_REL_AND_DBG)
-          WX_FIND_LIBS("${UNV}" "${UCD}" "d")
-        ENDIF(WX_USE_REL_AND_DBG)
-
-        # Settings for requested libs (i.e., include dir, libraries, etc.).
-        WX_SET_LIBRARIES(wxWidgets_FIND_COMPONENTS "${DBG}")
-
-      ENDIF(WX_CONFIGURATION)
-    ENDIF(WX_LIB_DIR)
-  ENDIF(WX_ROOT_DIR)
-
-#=====================================================================
-# UNIX_STYLE_FIND
-#=====================================================================
-ELSE(WIN32_STYLE_FIND)
-  IF(UNIX_STYLE_FIND)
-    #-----------------------------------------------------------------
-    # UNIX: Helper MACROS
-    #-----------------------------------------------------------------
-    #
-    # Set the default values based on "wx-config --selected-config".
-    #
-    MACRO(WX_CONFIG_SELECT_GET_DEFAULT)
-      EXECUTE_PROCESS(
-        COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" --selected-config
-        OUTPUT_VARIABLE _wx_selected_config
-        RESULT_VARIABLE _wx_result
-        ERROR_QUIET
-        )
-      IF(_wx_result EQUAL 0)
-        FOREACH(_opt_name debug static unicode universal)
-          STRING(TOUPPER ${_opt_name} _upper_opt_name)
-          IF(_wx_selected_config MATCHES ".*${_opt_name}.*")
-            SET(wxWidgets_DEFAULT_${_upper_opt_name} ON)
-          ELSE(_wx_selected_config MATCHES ".*${_opt_name}.*")
-            SET(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
-          ENDIF(_wx_selected_config MATCHES ".*${_opt_name}.*")
-        ENDFOREACH(_opt_name)
-      ELSE(_wx_result EQUAL 0)
-        FOREACH(_upper_opt_name DEBUG STATIC UNICODE UNIVERSAL)
-          SET(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
-        ENDFOREACH(_upper_opt_name)
-      ENDIF(_wx_result EQUAL 0)
-    ENDMACRO(WX_CONFIG_SELECT_GET_DEFAULT)
-
-    #
-    # Query a boolean configuration option to determine if the system
-    # has both builds available. If so, provide the selection option
-    # to the user.
-    #
-    MACRO(WX_CONFIG_SELECT_QUERY_BOOL _OPT_NAME _OPT_HELP)
-      EXECUTE_PROCESS(
-        COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" --${_OPT_NAME}=yes
-        RESULT_VARIABLE _wx_result_yes
-        OUTPUT_QUIET
-        ERROR_QUIET
-        )
-      EXECUTE_PROCESS(
-        COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" --${_OPT_NAME}=no
-        RESULT_VARIABLE _wx_result_no
-        OUTPUT_QUIET
-        ERROR_QUIET
-        )
-      STRING(TOUPPER ${_OPT_NAME} _UPPER_OPT_NAME)
-      IF(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
-        OPTION(wxWidgets_USE_${_UPPER_OPT_NAME}
-          ${_OPT_HELP} ${wxWidgets_DEFAULT_${_UPPER_OPT_NAME}})
-      ELSE(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
-        # If option exists (already in cache), force to available one.
-        IF(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME})
-          IF(_wx_result_yes EQUAL 0)
-            SET(wxWidgets_USE_${_UPPER_OPT_NAME} ON  CACHE BOOL ${_OPT_HELP} FORCE)
-          ELSE(_wx_result_yes EQUAL 0)
-            SET(wxWidgets_USE_${_UPPER_OPT_NAME} OFF CACHE BOOL ${_OPT_HELP} FORCE)
-          ENDIF(_wx_result_yes EQUAL 0)
-        ENDIF(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME})
-      ENDIF(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
-    ENDMACRO(WX_CONFIG_SELECT_QUERY_BOOL)
-
-    #
-    # Set wxWidgets_SELECT_OPTIONS to wx-config options for selecting
-    # among multiple builds.
-    #
-    MACRO(WX_CONFIG_SELECT_SET_OPTIONS)
-      SET(wxWidgets_SELECT_OPTIONS "")
-      FOREACH(_opt_name debug static unicode universal)
-        STRING(TOUPPER ${_opt_name} _upper_opt_name)
-        IF(DEFINED wxWidgets_USE_${_upper_opt_name})
-          IF(wxWidgets_USE_${_upper_opt_name})
-            LIST(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=yes)
-          ELSE(wxWidgets_USE_${_upper_opt_name})
-            LIST(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=no)
-          ENDIF(wxWidgets_USE_${_upper_opt_name})
-        ENDIF(DEFINED wxWidgets_USE_${_upper_opt_name})
-      ENDFOREACH(_opt_name)
-    ENDMACRO(WX_CONFIG_SELECT_SET_OPTIONS)
-
-    #-----------------------------------------------------------------
-    # UNIX: Start actual work.
-    #-----------------------------------------------------------------
-    # Support cross-compiling, only search in the target platform.
-    FIND_PROGRAM(wxWidgets_CONFIG_EXECUTABLE wx-config
-      ONLY_CMAKE_FIND_ROOT_PATH
-      )
-
-    IF(wxWidgets_CONFIG_EXECUTABLE)
-      SET(wxWidgets_FOUND TRUE)
-
-      # get defaults based on "wx-config --selected-config"
-      WX_CONFIG_SELECT_GET_DEFAULT()
-
-      # for each option: if both builds are available, provide option
-      WX_CONFIG_SELECT_QUERY_BOOL(debug "Use debug build?")
-      WX_CONFIG_SELECT_QUERY_BOOL(unicode "Use unicode build?")
-      WX_CONFIG_SELECT_QUERY_BOOL(universal "Use universal build?")
-      WX_CONFIG_SELECT_QUERY_BOOL(static "Link libraries statically?")
-
-      # process selection to set wxWidgets_SELECT_OPTIONS
-      WX_CONFIG_SELECT_SET_OPTIONS()
-      DBG_MSG("wxWidgets_SELECT_OPTIONS=${wxWidgets_SELECT_OPTIONS}")
-
-      # run the wx-config program to get cxxflags
-      EXECUTE_PROCESS(
-        COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
-          ${wxWidgets_SELECT_OPTIONS} --cxxflags
-        OUTPUT_VARIABLE wxWidgets_CXX_FLAGS
-        RESULT_VARIABLE RET
-        ERROR_QUIET
-        )
-      IF(RET EQUAL 0)
-#        STRING(STRIP "${wxWidgets_CXX_FLAGS}" wxWidgets_CXX_FLAGS)
-#        SEPARATE_ARGUMENTS(wxWidgets_CXX_FLAGS)
-
-	STRING(REPLACE "\n" "" wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
-	STRING(REPLACE " " ";" wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
-
-        DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
-
-        # parse definitions from cxxflags; drop -D* from CXXFLAGS
-        STRING(REGEX MATCHALL "[-][D][^;]+"
-          wxWidgets_DEFINITIONS  "${wxWidgets_CXX_FLAGS}")
-        STRING(REGEX REPLACE "[-][D][^;]+;" ""
-          wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
-
-	DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
-
-        # parse include dirs from cxxflags; drop -I prefix
-        STRING(REGEX MATCHALL "[-][I][^;]+"
-          wxWidgets_INCLUDE_DIRS "${wxWidgets_CXX_FLAGS}")
-	STRING(REPLACE "-I" ""
-          wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}")
-        STRING(REGEX REPLACE "[-][I][^;]+;" ""
-          wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
-
-	STRING(REPLACE ";" "" wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
-
-        DBG_MSG_V("wxWidgets_DEFINITIONS=${wxWidgets_DEFINITIONS}")
-        DBG_MSG_V("wxWidgets_INCLUDE_DIRS=${wxWidgets_INCLUDE_DIRS}")
-        DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
-
-      ELSE(RET EQUAL 0)
-        SET(wxWidgets_FOUND FALSE)
-        DBG_MSG_V(
-          "${wxWidgets_CONFIG_EXECUTABLE} --cxxflags FAILED with RET=${RET}")
-      ENDIF(RET EQUAL 0)
-
-      # run the wx-config program to get the libs
-      # - NOTE: wx-config doesn't verify that the libs requested exist
-      #         it just produces the names. Maybe a TRY_COMPILE would
-      #         be useful here...
-
-      STRING(REPLACE ";" ","
-        wxWidgets_FIND_COMPONENTS "${wxWidgets_FIND_COMPONENTS}")
-      EXECUTE_PROCESS(
-        COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
-          ${wxWidgets_SELECT_OPTIONS} --libs ${wxWidgets_FIND_COMPONENTS}
-        OUTPUT_VARIABLE wxWidgets_LIBRARIES
-        RESULT_VARIABLE RET
-        ERROR_QUIET
-        )
-      IF(RET EQUAL 0)
-#        STRING(STRIP "${wxWidgets_LIBRARIES}" wxWidgets_LIBRARIES)
-#        SEPARATE_ARGUMENTS(wxWidgets_LIBRARIES)
-
-	STRING(REPLACE "\n" "" wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
-	STRING(REPLACE " " ";" wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
-
-        STRING(REPLACE "-framework;" "-framework "
-          wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
-        STRING(REPLACE "-arch;" "-arch "
-          wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
-        STRING(REPLACE "-isysroot;" "-isysroot "
-          wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
-
-        # extract linkdirs (-L) for rpath (i.e., LINK_DIRECTORIES)
-        STRING(REGEX MATCHALL "[-][L][^ ;]+"
-          wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARIES}")
-        STRING(REPLACE "-L" ""
-          wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARY_DIRS}")
-
-        DBG_MSG_V("wxWidgets_LIBRARIES=${wxWidgets_LIBRARIES}")
-        DBG_MSG_V("wxWidgets_LIBRARY_DIRS=${wxWidgets_LIBRARY_DIRS}")
-
-      ELSE(RET EQUAL 0)
-        SET(wxWidgets_FOUND FALSE)
-        DBG_MSG("${wxWidgets_CONFIG_EXECUTABLE} --libs ${wxWidgets_FIND_COMPONENTS} FAILED with RET=${RET}")
-      ENDIF(RET EQUAL 0)
-    ENDIF(wxWidgets_CONFIG_EXECUTABLE)
-
-#=====================================================================
-# Neither UNIX_STYLE_FIND, nor WIN32_STYLE_FIND
-#=====================================================================
-  ELSE(UNIX_STYLE_FIND)
-    IF(NOT wxWidgets_FIND_QUIETLY)
-      MESSAGE(STATUS
-        "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): \n"
-        "  Platform unknown/unsupported. It's neither WIN32 nor UNIX "
-        "style find."
-        )
-    ENDIF(NOT wxWidgets_FIND_QUIETLY)
-  ENDIF(UNIX_STYLE_FIND)
-ENDIF(WIN32_STYLE_FIND)
-
-# Debug output:
-DBG_MSG("wxWidgets_FOUND           : ${wxWidgets_FOUND}")
-DBG_MSG("wxWidgets_INCLUDE_DIRS    : ${wxWidgets_INCLUDE_DIRS}")
-DBG_MSG("wxWidgets_LIBRARY_DIRS    : ${wxWidgets_LIBRARY_DIRS}")
-DBG_MSG("wxWidgets_LIBRARIES       : ${wxWidgets_LIBRARIES}")
-DBG_MSG("wxWidgets_CXX_FLAGS       : ${wxWidgets_CXX_FLAGS}")
-DBG_MSG("wxWidgets_USE_FILE        : ${wxWidgets_USE_FILE}")
-
-#=====================================================================
-#=====================================================================
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(wxWidgets DEFAULT_MSG wxWidgets_FOUND)
-# Maintain consistency with all other variables.
-SET(wxWidgets_FOUND ${WXWIDGETS_FOUND})
-
-# #=====================================================================
-# # Macros for use in wxWidgets apps.
-# # - This module will not fail to find wxWidgets based on the code
-# #   below. Hence, it's required to check for validity of:
-# #
-# # wxWidgets_wxrc_EXECUTABLE
-# #=====================================================================
-#
-# # Resource file compiler.
-# FIND_PROGRAM(wxWidgets_wxrc_EXECUTABLE wxrc
-#   ${wxWidgets_ROOT_DIR}/utils/wxrc/vc_msw
-#   )
-#
-# #
-# # WX_SPLIT_ARGUMENTS_ON(<keyword> <left> <right> <arg1> <arg2> ...)
-# #
-# # Sets <left> and <right> to contain arguments to the left and right,
-# # respectively, of <keyword>.
-# #
-# # Example usage:
-# #  FUNCTION(WXWIDGETS_ADD_RESOURCES outfiles)
-# #    WX_SPLIT_ARGUMENTS_ON(OPTIONS wxrc_files wxrc_options ${ARGN})
-# #    ...
-# #  ENDFUNCTION(WXWIDGETS_ADD_RESOURCES)
-# #
-# #  WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o file.C)
-# #
-# # 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
-# # FindPackageStandardArgs.cmake. At the time of this writing
-# # FindQt4.cmake has a QT4_EXTRACT_OPTIONS, which I basically copied
-# # here a bit more generalized. So, there are already two find modules
-# # using this approach.
-# #
-# FUNCTION(WX_SPLIT_ARGUMENTS_ON _keyword _leftvar _rightvar)
-#   # FIXME: Document that the input variables will be cleared.
-#   #LIST(APPEND ${_leftvar}  "")
-#   #LIST(APPEND ${_rightvar} "")
-#   SET(${_leftvar}  "")
-#   SET(${_rightvar} "")
-#
-#   SET(_doing_right FALSE)
-#   FOREACH(element ${ARGN})
-#     IF("${element}" STREQUAL "${_keyword}")
-#       SET(_doing_right TRUE)
-#     ELSE("${element}" STREQUAL "${_keyword}")
-#       IF(_doing_right)
-#         LIST(APPEND ${_rightvar} "${element}")
-#       ELSE(_doing_right)
-#         LIST(APPEND ${_leftvar} "${element}")
-#       ENDIF(_doing_right)
-#     ENDIF("${element}" STREQUAL "${_keyword}")
-#   ENDFOREACH(element)
-#
-#   RAISE_SCOPE(${_leftvar})
-#   RAISE_SCOPE(${_rightvar})
-# ENDFUNCTION(WX_SPLIT_ARGUMENTS_ON)
-#
-# #
-# # WX_GET_DEPENDENCIES_FROM_XML(
-# #   <depends>
-# #   <match_pattern>
-# #   <clean_pattern>
-# #   <xml_contents>
-# #   <depends_path>
-# #   )
-# #
-# # FIXME: Add documentation here...
-# #
-# FUNCTION(WX_GET_DEPENDENCIES_FROM_XML
-#     _depends
-#     _match_patt
-#     _clean_patt
-#     _xml_contents
-#     _depends_path
-#     )
-#
-#   STRING(REGEX MATCHALL
-#     ${_match_patt}
-#     dep_file_list
-#     "${${_xml_contents}}"
-#     )
-#   FOREACH(dep_file ${dep_file_list})
-#     STRING(REGEX REPLACE ${_clean_patt} "" dep_file "${dep_file}")
-#
-#     # make the file have an absolute path
-#     IF(NOT IS_ABSOLUTE "${dep_file}")
-#       SET(dep_file "${${_depends_path}}/${dep_file}")
-#     ENDIF(NOT IS_ABSOLUTE "${dep_file}")
-#
-#     # append file to dependency list
-#     LIST(APPEND ${_depends} "${dep_file}")
-#   ENDFOREACH(dep_file)
-#
-#   RAISE_SCOPE(${_depends})
-# ENDFUNCTION(WX_GET_DEPENDENCIES_FROM_XML)
-#
-# #
-# # WXWIDGETS_ADD_RESOURCES(<sources> <xrc_files>
-# #                         OPTIONS <options> [NO_CPP_CODE])
-# #
-# # Adds a custom command for resource file compilation of the
-# # <xrc_files> and appends the output files to <sources>.
-# #
-# # Example usages:
-# #   WXWIDGETS_ADD_RESOURCES(sources xrc/main_frame.xrc)
-# #   WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o altname.cxx)
-# #
-# FUNCTION(WXWIDGETS_ADD_RESOURCES _outfiles)
-#   WX_SPLIT_ARGUMENTS_ON(OPTIONS rc_file_list rc_options ${ARGN})
-#
-#   # Parse files for dependencies.
-#   SET(rc_file_list_abs "")
-#   SET(rc_depends       "")
-#   FOREACH(rc_file ${rc_file_list})
-#     GET_FILENAME_COMPONENT(depends_path ${rc_file} PATH)
-#
-#     GET_FILENAME_COMPONENT(rc_file_abs ${rc_file} ABSOLUTE)
-#     LIST(APPEND rc_file_list_abs "${rc_file_abs}")
-#
-#     # All files have absolute paths or paths relative to the location
-#     # of the rc file.
-#     FILE(READ "${rc_file_abs}" rc_file_contents)
-#
-#     # get bitmap/bitmap2 files
-#     WX_GET_DEPENDENCIES_FROM_XML(
-#       rc_depends
-#       "<bitmap[^<]+"
-#       "^<bitmap[^>]*>"
-#       rc_file_contents
-#       depends_path
-#       )
-#
-#     # get url files
-#     WX_GET_DEPENDENCIES_FROM_XML(
-#       rc_depends
-#       "<url[^<]+"
-#       "^<url[^>]*>"
-#       rc_file_contents
-#       depends_path
-#       )
-#
-#     # get wxIcon files
-#     WX_GET_DEPENDENCIES_FROM_XML(
-#       rc_depends
-#       "<object[^>]*class=\"wxIcon\"[^<]+"
-#       "^<object[^>]*>"
-#       rc_file_contents
-#       depends_path
-#       )
-#   ENDFOREACH(rc_file)
-#
-#   #
-#   # Parse options.
-#   #
-#   # If NO_CPP_CODE option specified, then produce .xrs file rather
-#   # than a .cpp file (i.e., don't add the default --cpp-code option).
-#   LIST(FIND rc_options NO_CPP_CODE index)
-#   IF(index EQUAL -1)
-#     LIST(APPEND rc_options --cpp-code)
-#     # wxrc's default output filename for cpp code.
-#     SET(outfile resource.cpp)
-#   ELSE(index EQUAL -1)
-#     LIST(REMOVE_AT rc_options ${index})
-#     # wxrc's default output filename for xrs file.
-#     SET(outfile resource.xrs)
-#   ENDIF(index EQUAL -1)
-#
-#   # Get output name for use in ADD_CUSTOM_COMMAND.
-#   # - short option scanning
-#   LIST(FIND rc_options -o index)
-#   IF(NOT index EQUAL -1)
-#     MATH(EXPR filename_index "${index} + 1")
-#     LIST(GET rc_options ${filename_index} outfile)
-#     #LIST(REMOVE_AT rc_options ${index} ${filename_index})
-#   ENDIF(NOT index EQUAL -1)
-#   # - long option scanning
-#   STRING(REGEX MATCH "--output=[^;]*" outfile_opt "${rc_options}")
-#   IF(outfile_opt)
-#     STRING(REPLACE "--output=" "" outfile "${outfile_opt}")
-#   ENDIF(outfile_opt)
-#   #STRING(REGEX REPLACE "--output=[^;]*;?" "" rc_options "${rc_options}")
-#   #STRING(REGEX REPLACE ";$" "" rc_options "${rc_options}")
-#
-#   IF(NOT IS_ABSOLUTE "${outfile}")
-#     SET(outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
-#   ENDIF(NOT IS_ABSOLUTE "${outfile}")
-#   ADD_CUSTOM_COMMAND(
-#     OUTPUT "${outfile}"
-#     COMMAND ${wxWidgets_wxrc_EXECUTABLE} ${rc_options} ${rc_file_list_abs}
-#     DEPENDS ${rc_file_list_abs} ${rc_depends}
-#     )
-#
-#   # Add generated header to output file list.
-#   LIST(FIND rc_options -e short_index)
-#   LIST(FIND rc_options --extra-cpp-code long_index)
-#   IF(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1)
-#     GET_FILENAME_COMPONENT(outfile_ext ${outfile} EXT)
-#     STRING(REPLACE "${outfile_ext}" ".h" outfile_header "${outfile}")
-#     LIST(APPEND ${_outfiles} "${outfile_header}")
-#     SET_SOURCE_FILES_PROPERTIES(
-#       "${outfile_header}" PROPERTIES GENERATED TRUE
-#       )
-#   ENDIF(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1)
-#
-#   # Add generated file to output file list.
-#   LIST(APPEND ${_outfiles} "${outfile}")
-#
-#   RAISE_SCOPE(${_outfiles})
-# ENDFUNCTION(WXWIDGETS_ADD_RESOURCES)
diff --git a/CMakeModules/UsewxWidgets.cmake b/CMakeModules/UsewxWidgets.cmake
deleted file mode 100644
index 5d44b1ff06..0000000000
--- a/CMakeModules/UsewxWidgets.cmake
+++ /dev/null
@@ -1,73 +0,0 @@
-# CMake CVS r1.5
-
-# - Convenience include for using wxWidgets library
-# Finds if wxWidgets is installed 
-# and set the appropriate libs, incdirs, flags etc. 
-# INCLUDE_DIRECTORIES, LINK_DIRECTORIES and ADD_DEFINITIONS
-# are called.
-#
-# USAGE
-#  SET( wxWidgets_USE_LIBS  gl xml xrc ) # optionally: more than wx std libs
-#  FIND_PACKAGE(wxWidgets REQUIRED)
-#  INCLUDE( ${xWidgets_USE_FILE} )
-#  ... add your targets here, e.g. ADD_EXECUTABLE/ ADD_LIBRARY ...
-#  TARGET_LINK_LIBRARIERS( <yourWxDependantTarget>  ${wxWidgets_LIBRARIES})
-# 
-# DEPRECATED
-#  LINK_LIBRARIES is not called in favor of adding dependencies per target.
-#
-# AUTHOR
-#  Jan Woetzel <jw -at- mip.informatik.uni-kiel.de>
-
-
-# debug message and logging. 
-# comment these out for distribution
-IF    (NOT LOGFILE )
-  #  SET(LOGFILE "${PROJECT_BINARY_DIR}/CMakeOutput.log")
-ENDIF (NOT LOGFILE )
-MACRO(MSG _MSG)
-  #  FILE(APPEND ${LOGFILE} "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}):   ${_MSG}\n")
-  #  MESSAGE(STATUS "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
-ENDMACRO(MSG)
-
-
-MSG("wxWidgets_FOUND=${wxWidgets_FOUND}")
-IF   (wxWidgets_FOUND)
-  IF   (wxWidgets_INCLUDE_DIRS)
-    IF(wxWidgets_INCLUDE_DIRS_NO_SYSTEM)
-      INCLUDE_DIRECTORIES(${wxWidgets_INCLUDE_DIRS})
-    ELSE(wxWidgets_INCLUDE_DIRS_NO_SYSTEM)
-      INCLUDE_DIRECTORIES(SYSTEM ${wxWidgets_INCLUDE_DIRS})
-    ENDIF(wxWidgets_INCLUDE_DIRS_NO_SYSTEM)
-    MSG("wxWidgets_INCLUDE_DIRS=${wxWidgets_INCLUDE_DIRS}")
-  ENDIF(wxWidgets_INCLUDE_DIRS)
-
-  IF   (wxWidgets_LIBRARY_DIRS)
-    LINK_DIRECTORIES(${wxWidgets_LIBRARY_DIRS})
-    MSG("wxWidgets_LIBRARY_DIRS=${wxWidgets_LIBRARY_DIRS}")
-  ENDIF(wxWidgets_LIBRARY_DIRS)
-
-  IF   (wxWidgets_DEFINITIONS)
-    ADD_DEFINITIONS( ${wxWidgets_DEFINITIONS} )
-    MSG("wxWidgets_DEFINITIONS=${wxWidgets_DEFINITIONS}")
-  ENDIF(wxWidgets_DEFINITIONS)  
-
-  IF   (wxWidgets_CXX_FLAGS)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}")
-    MSG("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
-  ENDIF(wxWidgets_CXX_FLAGS)
-
-  # DEPRECATED JW
-  # just for backward compatibility: add deps to all targets
-  # library projects better use advanced FIND_PACKAGE(wxWidgets) directly.
-  #IF(wxWidgets_LIBRARIES)
-  #  LINK_LIBRARIES(${wxWidgets_LIBRARIES})
-  #  # BUG: str too long:  MSG("wxWidgets_LIBRARIES=${wxWidgets_LIBRARIES}")
-  #  IF(LOGFILE)
-  #    FILE(APPEND ${LOGFILE} "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}):   ${wxWidgets_LIBRARIES}\n")
-  #  ENDIF(LOGFILE)
-  #ENDIF(wxWidgets_LIBRARIES)  
-  
-ELSE (wxWidgets_FOUND)
-  MESSAGE("wxWidgets requested but not found.")
-ENDIF(wxWidgets_FOUND)
diff --git a/bitmaps/CMakeLists.txt b/bitmaps/CMakeLists.txt
index 1aeb22886e..4eed2e563f 100644
--- a/bitmaps/CMakeLists.txt
+++ b/bitmaps/CMakeLists.txt
@@ -5,7 +5,7 @@
 # Compile those *.cpp files and put them into the library, then done.
 
 # builds a set of all the .xpm files
-FILE(GLOB BITMAP_SRCS *.xpm)
+file(GLOB BITMAP_SRCS *.xpm)
 
 # Get the path of the *.xpm files into "PATH"
 set(PATH ${CMAKE_CURRENT_SOURCE_DIR})
@@ -13,7 +13,8 @@ set(PATH ${CMAKE_CURRENT_SOURCE_DIR})
 
 # The name of the directory to put the copied and renamed *.xpm files into.
 # As files are copied they are renamed to *.cpp.
-set(XPM_CPP_PATH "${PATH}/auto_renamed_to_cpp" CACHE PATH "path to store renamed .xpm files for compilation" )
+set(XPM_CPP_PATH "${PATH}/auto_renamed_to_cpp"
+    CACHE PATH "path to store renamed .xpm files for compilation")
 
 foreach(LOOP_VAR ${BITMAP_SRCS})
     get_filename_component(BASENAME ${LOOP_VAR} NAME_WE)
diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index e64a35fbea..e5d5b34d8b 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -1,10 +1,9 @@
 add_definitions(-DCVPCB)
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ../3d-viewer
-    ../pcbnew
-    ../polygon)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+                    ../3d-viewer
+                    ../pcbnew
+                    ../polygon)
 
 set(CVPCB_SRCS
     autosel.cpp
@@ -61,11 +60,11 @@ if(WIN32)
         set(CVPCB_RESOURCES cvpcb.rc)
     endif(MINGW)
 endif(WIN32)
+
 if(APPLE)
     set(CVPCB_RESOURCES cvpcb.icns)
     set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.icns"
-        PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-
+                                PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(MACOSX_BUNDLE_ICON_FILE cvpcb.icns)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.cvpcb)
     set(MACOSX_BUNDLE_NAME cvpcb)
@@ -73,15 +72,9 @@ endif(APPLE)
 
 add_executable(cvpcb WIN32 MACOSX_BUNDLE ${CVPCB_SRCS} ${CVPCB_EXTRA_SRCS} ${CVPCB_RESOURCES})
 
-target_link_libraries(cvpcb 3d-viewer common polygon kbool bitmaps ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES})
+target_link_libraries(cvpcb 3d-viewer common polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES})
 
-if(NOT APPLE)
-    install(TARGETS cvpcb
-        RUNTIME DESTINATION ${KICAD_BIN}
-        COMPONENT binary)
-else(NOT APPLE)
-    install(TARGETS cvpcb
+install(TARGETS cvpcb
         RUNTIME DESTINATION ${KICAD_BIN}
         BUNDLE DESTINATION ${KICAD_BIN}
         COMPONENT binary)
-endif(NOT APPLE)
diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index 76b15a6bda..3783c91586 100644
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
@@ -1,5 +1,5 @@
 install(DIRECTORY ecc83 electric flat_hierarchy interf_u microwave
-    pic_programmer pspice "sonde xilinx" test_xil_95108 video
-    DESTINATION ${KICAD_DEMOS}
-    COMPONENT resources
-    PATTERN ".svn" EXCLUDE)
+                  pic_programmer pspice "sonde xilinx" test_xil_95108 video
+        DESTINATION ${KICAD_DEMOS}
+        COMPONENT resources
+        PATTERN ".svn" EXCLUDE)
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index b761adee55..0c9b1282da 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -110,11 +110,11 @@ if(WIN32)
         set(EESCHEMA_RESOURCES eeschema.rc)
     endif(MINGW)
 endif(WIN32)
+
 if(APPLE)
     set(EESCHEMA_RESOURCES eeschema.icns)
     set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/eeschema.icns"
-        PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-
+                                PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(MACOSX_BUNDLE_ICON_FILE eeschema.icns)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.eeschema)
     set(MACOSX_BUNDLE_NAME eeschema)
@@ -124,15 +124,9 @@ add_executable(eeschema WIN32 MACOSX_BUNDLE ${EESCHEMA_SRCS} ${EESCHEMA_EXTRA_SR
 
 target_link_libraries(eeschema common bitmaps ${wxWidgets_LIBRARIES})
 
-if(NOT APPLE)
-    install(TARGETS eeschema
-        RUNTIME DESTINATION ${KICAD_BIN}
-        COMPONENT binary)
-else(NOT APPLE)
-    install(TARGETS eeschema
+install(TARGETS eeschema
         RUNTIME DESTINATION ${KICAD_BIN}
         BUNDLE DESTINATION ${KICAD_BIN}
         COMPONENT binary)
-endif(NOT APPLE)
 
 add_subdirectory(plugins)
diff --git a/eeschema/plugins/CMakeLists.txt b/eeschema/plugins/CMakeLists.txt
index 62fe42fdc3..e60f76eb20 100644
--- a/eeschema/plugins/CMakeLists.txt
+++ b/eeschema/plugins/CMakeLists.txt
@@ -4,5 +4,6 @@ endif(UNIX)
 
 add_executable(netlist_form_pads-pcb netlist_form_pads-pcb.cpp)
 
-install(TARGETS netlist_form_pads-pcb RUNTIME DESTINATION ${KICAD_PLUGINS}
-    COMPONENT binary)
+install(TARGETS netlist_form_pads-pcb
+        RUNTIME DESTINATION ${KICAD_PLUGINS}
+        COMPONENT binary)
diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index 81d6ce0750..5ea99dc7dd 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -1,11 +1,10 @@
 add_definitions(-DGERBVIEW -DPCBNEW)
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ../3d-viewer
-    ../cvpcb
-    ../pcbnew
-    ../polygon)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+                    ../3d-viewer
+                    ../cvpcb
+                    ../pcbnew
+                    ../polygon)
 
 set(GERBVIEW_SRCS
     affiche.cpp
@@ -67,11 +66,11 @@ if(WIN32)
         set(GERBVIEW_RESOURCES gerbview.rc)
     endif(MINGW)
 endif(WIN32)
+
 if(APPLE)
     set(GERBVIEW_RESOURCES gerbview.icns)
     set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/gerbview.icns"
-        PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-
+                                PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(MACOSX_BUNDLE_ICON_FILE gerbview.icns)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.gerbview)
     set(MACOSX_BUNDLE_NAME gerbview)
@@ -79,15 +78,9 @@ endif(APPLE)
 
 add_executable(gerbview WIN32 MACOSX_BUNDLE ${GERBVIEW_SRCS} ${GERBVIEW_EXTRA_SRCS} ${GERBVIEW_RESOURCES})
 
-target_link_libraries(gerbview 3d-viewer common polygon kbool bitmaps ${wxWidgets_LIBRARIES})
+target_link_libraries(gerbview 3d-viewer common polygon bitmaps kbool ${wxWidgets_LIBRARIES})
 
-if(NOT APPLE)
-    install(TARGETS gerbview
-        RUNTIME DESTINATION ${KICAD_BIN}
-        COMPONENT binary)
-else(NOT APPLE)
-    install(TARGETS gerbview
+install(TARGETS gerbview
         RUNTIME DESTINATION ${KICAD_BIN}
         BUNDLE DESTINATION ${KICAD_BIN}
         COMPONENT binary)
-endif(NOT APPLE)
diff --git a/internat/CMakeLists.txt b/internat/CMakeLists.txt
index 5e6e090327..352deb5a64 100644
--- a/internat/CMakeLists.txt
+++ b/internat/CMakeLists.txt
@@ -1,4 +1,4 @@
 install(DIRECTORY ca cs de es fr hu it ko nl pl pt ru sl sv zh_CN
-    DESTINATION ${KICAD_INTERNAT}
-    COMPONENT resources
-    PATTERN ".svn" EXCLUDE)
+        DESTINATION ${KICAD_INTERNAT}
+        COMPONENT resources
+        PATTERN ".svn" EXCLUDE)
diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
index d8016f4a02..8f245f9c82 100644
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@ -19,11 +19,11 @@ if(WIN32)
         set(KICAD_RESOURCES kicad.rc)
     endif(MINGW)
 endif(WIN32)
+
 if(APPLE)
     set(KICAD_RESOURCES kicad.icns)
     set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/kicad.icns"
-        PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-
+                                PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(MACOSX_BUNDLE_ICON_FILE kicad.icns)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.kicad)
     set(MACOSX_BUNDLE_NAME kicad)
@@ -33,16 +33,10 @@ add_executable(kicad WIN32 MACOSX_BUNDLE ${KICAD_SRCS} ${KICAD_EXTRA_SRCS} ${KIC
 
 target_link_libraries(kicad common bitmaps ${wxWidgets_LIBRARIES})
 
-if(NOT APPLE)
-    install(TARGETS kicad
-        RUNTIME DESTINATION ${KICAD_BIN}
-        COMPONENT binary)
-else(NOT APPLE)
-    install(TARGETS kicad
+install(TARGETS kicad
         RUNTIME DESTINATION ${KICAD_BIN}
         BUNDLE DESTINATION ${KICAD_BIN}
         COMPONENT binary)
-endif(NOT APPLE)
 
 if(KICAD_MINIZIP)
     add_subdirectory(minizip)
diff --git a/kicad/minizip/CMakeLists.txt b/kicad/minizip/CMakeLists.txt
index 7674871a12..9c0e47db78 100644
--- a/kicad/minizip/CMakeLists.txt
+++ b/kicad/minizip/CMakeLists.txt
@@ -12,9 +12,8 @@ else(ZLIB_FOUND)
     set(ZLIB_LIBRARIES ${wxWidgets_ROOT_DIR}/lib/libwxzlib-2.8.a)
 endif(ZLIB_FOUND)
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${ZLIB_INCLUDE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+                    ${ZLIB_INCLUDE_DIR})
 
 set(MINIZIP_SRCS
     ioapi.c
@@ -25,5 +24,6 @@ add_executable(minizip ${MINIZIP_SRCS})
 
 target_link_libraries(minizip ${ZLIB_LIBRARIES})
 
-install(TARGETS minizip RUNTIME DESTINATION ${KICAD_BIN}
-    COMPONENT binary)
+install(TARGETS minizip
+        RUNTIME DESTINATION ${KICAD_BIN}
+        COMPONENT binary)
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 6a24624ac1..ecd9dcba25 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -1,10 +1,9 @@
 add_definitions(-DPCBNEW)
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${Boost_INCLUDE_DIR}
-    ../3d-viewer
-    ../polygon)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+                    ${Boost_INCLUDE_DIR}
+                    ../3d-viewer
+                    ../polygon)
 
 # Many of the commented out ones are nested in *.cpp files for dialogs
 set(PCBNEW_SRCS
@@ -157,11 +156,11 @@ if(WIN32)
         set(PCBNEW_RESOURCES pcbnew.rc)
     endif(MINGW)
 endif(WIN32)
+
 if(APPLE)
     set(PCBNEW_RESOURCES pcbnew.icns)
     set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/pcbnew.icns"
-        PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-
+                                PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(MACOSX_BUNDLE_ICON_FILE pcbnew.icns)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.pcbnew)
     set(MACOSX_BUNDLE_NAME pcbnew)
@@ -169,18 +168,12 @@ endif(APPLE)
 
 add_executable(pcbnew WIN32 MACOSX_BUNDLE ${PCBNEW_SRCS} ${PCBNEW_EXTRA_SRCS} ${PCBNEW_RESOURCES})
 
-target_link_libraries(pcbnew 3d-viewer common polygon kbool bitmaps ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES})
+target_link_libraries(pcbnew 3d-viewer common polygon bitmaps kbool ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES})
 
-if(NOT APPLE)
-    install(TARGETS pcbnew
-        RUNTIME DESTINATION ${KICAD_BIN}
-        COMPONENT binary)
-else(NOT APPLE)
-    install(TARGETS pcbnew
+install(TARGETS pcbnew
         RUNTIME DESTINATION ${KICAD_BIN}
         BUNDLE DESTINATION ${KICAD_BIN}
         COMPONENT binary)
-endif(NOT APPLE)
 
 
 # This one gets made only when testing.
diff --git a/resources/icons/CMakeLists.txt b/resources/icons/CMakeLists.txt
index a8a346a235..1d3fb3cea9 100644
--- a/resources/icons/CMakeLists.txt
+++ b/resources/icons/CMakeLists.txt
@@ -4,6 +4,6 @@
 
 file(GLOB png_icons "*.png")
 
-install (FILES ${png_icons}
-         DESTINATION ${KICAD_PROGRAM_ICONS}
-         COMPONENT resources)
+install(FILES ${png_icons}
+        DESTINATION ${KICAD_PROGRAM_ICONS}
+        COMPONENT resources)
diff --git a/template/CMakeLists.txt b/template/CMakeLists.txt
index 09d5519c70..e9cdf07dee 100644
--- a/template/CMakeLists.txt
+++ b/template/CMakeLists.txt
@@ -1,2 +1,3 @@
-install(FILES kicad.pro DESTINATION ${KICAD_TEMPLATE}
-    COMPONENT resources)
+install(FILES kicad.pro
+        DESTINATION ${KICAD_TEMPLATE}
+        COMPONENT resources)