ENH: contribution from Jan Woetzel

1 files changed, 469 insertions, 191 deletions

diff --git a/Modules/FindwxWindows.cmake b/Modules/FindwxWindows.cmake
index a7352a8927..f5f30652a6 100644
--- a/Modules/FindwxWindows.cmake
+++ b/Modules/FindwxWindows.cmake
@@ -1,6 +1,6 @@
-# - Find wxWindows installation
-# This module finds if wxWindows is installed and determines where the
-# include files and libraries are. It also determines what the name of
+# - Find wxWindows (wxWidgets) installation 
+# This module finds if wxWindows/wxWidgets is installed and determines where 
+# the include files and libraries are. It also determines what the name of
 # the library is. This code sets the following variables:
 #  
 #  WXWINDOWS_FOUND     = system has WxWindows 
@@ -8,49 +8,62 @@
 #                        on Unix/Linux with additional 
 #                        linker flags from 
 #                        "wx-config --libs"
-#  CMAKE_WXWINDOWS_CXX_FLAGS = Compiler flags for 
-#                              wxWindows, essentially 
-#                              "`wx-config --cxxflags`"
-#  WXWINDOWS_INCLUDE_DIR   = where to find "wx/wx.h" etc
-#  WXWINDOWS_LINK_DIRECTORIES = link directories
+#  CMAKE_WXWINDOWS_CXX_FLAGS  = Compiler flags for wxWindows, 
+#                               essentially "`wx-config --cxxflags`"
+#                               on Linux
+#  WXWINDOWS_INCLUDE_DIR      = where to find "wx/wx.h" and "wx/setup.h"
+#  WXWINDOWS_LINK_DIRECTORIES = link directories, useful for rpath on
+#                                Unix
 #  WXWINDOWS_DEFINITIONS      = extra defines
-#  deprecated: 
-#   * CMAKE_WX_CAN_COMPILE
-#   * WXWINDOWS_LIBRARY
-#   * CMAKE_WX_CXX_FLAGS
-#   * WXWINDOWS_INCLUDE_PATH
-#  
-#  For convenience include Use_wxWindows.cmake in your project's
-#  CMakeLists.txt using INCLUDE(Use_wxWindows). If you need OpenGL support
-#  please SET(WXWINDOWS_USE_GL 1) in your CMakeLists.txt *before* you include
-#  this file.  
+# 
+# DEPRECATED
+#  CMAKE_WX_CAN_COMPILE
+#  WXWINDOWS_LIBRARY
+#  CMAKE_WX_CXX_FLAGS
+#  WXWINDOWS_INCLUDE_PATH
+#
+# OPTIONS 
+# If you need OpenGL support please 
+#  SET(WXWINDOWS_USE_GL 1) 
+# in your CMakeLists.txt *before* you include this file.
+# 
+# For convenience include Use_wxWindows.cmake in your project's
+# CMakeLists.txt using INCLUDE(Use_wxWindows). 
+# 
+# USAGE 
+#  SET(WXWINDOWS_USE_GL 1) 
+#  FIND_PACKAGE(wxWindows)
+# 
+# NOTES
+# wxWidgets 2.6.x is supported for monolithic builds 
+# e.g. compiled  in wx/build/msw dir as:  
+#  nmake -f makefile.vc BUILD=debug SHARED=0 USE_OPENGL=1 MONOLITHIC=1
+#
+# AUTHOR
+# Jan Woetzel <http://www.mip.informatik.uni-kiel.de/~jw> (07/2003-01/2006)
 
 
 # ------------------------------------------------------------------
-# Author Jan Woetzel <http://www.mip.informatik.uni-kiel.de/~jw> (07/2003)
-# ------------------------------------------------------------------
 # 
-# -changed variable names to conventions from cmakes readme.txt (Jan Woetzel
-#  07/07/2003)
-# -added definition WINVER for WIN32 (Jan Woetzel 07/07//2003)
-# -added IF(CMAKE_WXWINDOWS_CONFIG_EXECUTABLE) found and changed
-#  CMAKE_WX_CONFIG to CMAKE_WXWINDOWS_CONFIG_EXECUTABLE (Jan Woetzel
-#  07/22/2003)
-# -removed OPTION for CMAKE_WXWINDOWS_USE_GL. Force the developer to SET it.
-# 
-# status: 
+# -removed OPTION for CMAKE_WXWINDOWS_USE_GL. Force the developer to SET it before calling this.
+# -major update for wx 2.6.2 and monolithic build option. (10/2005)
+#
+# STATUS 
 # tested with:
-#   -cmake 1.6.7, Linux (Suse 7.3), wxWindows 2.4.0, gcc 2.95
-#   -cmake 1.6.7, Linux (Suse 8.2), wxWindows 2.4.0, gcc 3.3
-#   -cmake 1.6.7, Linux (Suse 8.2), wxWindows 2.4.1-patch1,  gcc 3.3
-#   -cmake 1.6.7, MS Windows XP home, wxWindows 2.4.1, MS Visual Studio .net 7
-#    2002 (static build)
-# 
-# TODO: 
-#  -OPTION for unicode builds 
-#  -change WXWINDOWS_USE_GL to use FindOpenGL.cmake or let the user do it
-#  -testing of DLL linking under MS WIN32
-# 
+#  cmake 1.6.7, Linux (Suse 7.3), wxWindows 2.4.0, gcc 2.95
+#  cmake 1.6.7, Linux (Suse 8.2), wxWindows 2.4.0, gcc 3.3
+#  cmake 1.6.7, Linux (Suse 8.2), wxWindows 2.4.1-patch1,  gcc 3.3
+#  cmake 1.6.7, MS Windows XP home, wxWindows 2.4.1, MS Visual Studio .net 7 2002 (static build)
+#  cmake 2.0.5 on Windows XP and Suse Linux 9.2
+#  cmake 2.0.6 on Windows XP and Suse Linux 9.2, wxWidgets 2.6.2 MONOLITHIC build
+#  cmake 2.2.2 on Windows XP, MS Visual Studio .net 2003 7.1 wxWidgets 2.6.2 MONOLITHIC build
+#
+# TODO
+#  -OPTION for unicode builds
+#  -further testing of DLL linking under MS WIN32
+#  -better support for non-monolithic builds
+#
+
 
 IF(WIN32)
   SET(WIN32_STYLE_FIND 1)
@@ -65,191 +78,441 @@ ENDIF(UNIX)
 
 
 IF(WIN32_STYLE_FIND)
-  
-  # ###################################
-  #
-  # Windows specific:
-  #
-  # candidates for root/base directory of wxwindows
-  # should have subdirs include and lib containing include/wx/wx.h
-  # fix the root dir to avoid mixing of headers/libs from different
-  # versions/builds:
+
+  ## ######################################################################
+  ##
+  ## Windows specific:
+  ##
+  ## candidates for root/base directory of wxwindows
+  ## should have subdirs include and lib containing include/wx/wx.h
+  ## fix the root dir to avoid mixing of headers/libs from different
+  ## versions/builds:
   
   SET (WXWINDOWS_POSSIBLE_ROOT_PATHS
     $ENV{WXWIN}
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWindows_is1;Inno Setup: App Path]" )
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWidgets_is1;Inno Setup: App Path]"  ## WX 2.6.x
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWindows_is1;Inno Setup: App Path]"  ## WX 2.4.x
+    C:\\wxWidgets-2.6.2 
+    D:\\wxWidgets-2.6.2 
+    C:\\wxWidgets-2.6.1 
+    D:\\wxWidgets-2.6.1 
+    C:\\wxWindows-2.4.2 
+    D:\\wxWindows-2.4.2 
+    )
   
+  ## WX supports monolithic and multiple smaller libs (since 2.5.x), we prefer monolithic for now.
+  ## monolithic = WX is built as a single big library
+  ## e.g. compile on WIN32 as  "nmake -f makefile.vc MONOLITHIC=1 BUILD=debug SHARED=0 USE_OPENGL=1" (JW)
+  OPTION(WXWINDOWS_USE_MONOLITHIC "Use monolithic build of WX??" ON)
+  MARK_AS_ADVANCED(WXWINDOWS_USE_MONOLITHIC)
+
+  ## GL libs used?
+  OPTION(WXWINDOWS_USE_GL "Use Wx with GL support(glcanvas)?" ON)
+  MARK_AS_ADVANCED(WXWINDOWS_USE_GL)
+
+
+  ## avoid mixing of headers and libs between multiple installed WX versions,
+  ## select just one tree here: 
   FIND_PATH(WXWINDOWS_ROOT_DIR  include/wx/wx.h 
-    ${WXWINDOWS_POSSIBLE_ROOT_PATHS} )
-  
+    ${WXWINDOWS_POSSIBLE_ROOT_PATHS} )  
   # MESSAGE("DBG found WXWINDOWS_ROOT_DIR: ${WXWINDOWS_ROOT_DIR}")
   
-  # find libs for combination of static/shared with release/debug
-  SET (WXWINDOWS_POSSIBLE_LIB_PATHS
-    "${WXWINDOWS_ROOT_DIR}/lib" )
-  
-  FIND_LIBRARY(WXWINDOWS_STATIC_LIBRARY
-    NAMES wx wxmsw
-    PATHS ${WXWINDOWS_POSSIBLE_LIB_PATHS}
-    DOC "wxWindows static release build library" )
   
-  FIND_LIBRARY(WXWINDOWS_STATIC_DEBUG_LIBRARY
-    NAMES wxd wxmswd
-    PATHS ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
-    DOC "wxWindows static debug build library" )
+  ## find libs for combination of static/shared with release/debug
+  ## be careful if you add something here, 
+  ## avoid mixing of headers and libs of different wx versions, 
+  ## there may be multiple WX version s installed. 
+  SET (WXWINDOWS_POSSIBLE_LIB_PATHS
+    "${WXWINDOWS_ROOT_DIR}/lib"
+    ) 
   
-  FIND_LIBRARY(WXWINDOWS_SHARED_LIBRARY
-    NAMES wxmsw24 wxmsw241 wxmsw240 wx23_2 wx22_9 
-    PATHS ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
-    DOC "wxWindows shared release build library" )
+  ## monolithic?
+  IF (WXWINDOWS_USE_MONOLITHIC)
+    
+    FIND_LIBRARY(WXWINDOWS_STATIC_LIBRARY
+      NAMES wx wxmsw wxmsw26
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_lib"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS}
+      DOC "wxWindows static release build library" ) 
+    
+    FIND_LIBRARY(WXWINDOWS_STATIC_DEBUG_LIBRARY
+      NAMES wxd wxmswd wxmsw26d 
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_lib"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS}       
+      DOC "wxWindows static debug build library" )
+    
+    FIND_LIBRARY(WXWINDOWS_SHARED_LIBRARY
+      NAMES wxmsw26 wxmsw262 wxmsw24 wxmsw242 wxmsw241 wxmsw240 wx23_2 wx22_9 
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_dll"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
+      DOC "wxWindows shared release build library" )
+    
+    FIND_LIBRARY(WXWINDOWS_SHARED_DEBUG_LIBRARY
+      NAMES wxmsw26d wxmsw262d wxmsw24d wxmsw241d wxmsw240d wx23_2d wx22_9d 
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_dll"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
+      DOC "wxWindows shared debug build library " )
+
+
+    ##
+    ## required for WXWINDOWS_USE_GL
+    ## gl lib is always build separate:
+    ##
+    FIND_LIBRARY(WXWINDOWS_STATIC_LIBRARY_GL
+      NAMES wx_gl wxmsw_gl wxmsw26_gl 
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_lib"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
+      DOC "wxWindows static release build GL library" )
+
+    FIND_LIBRARY(WXWINDOWS_STATIC_DEBUG_LIBRARY_GL
+      NAMES wxd_gl wxmswd_gl wxmsw26d_gl 
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_lib"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
+      DOC "wxWindows static debug build GL library" )
+    
+
+    FIND_LIBRARY(WXWINDOWS_STATIC_DEBUG_LIBRARY_PNG
+      NAMES wxpngd 
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_lib"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
+      DOC "wxWindows static debug png library" )
+
+    FIND_LIBRARY(WXWINDOWS_STATIC_LIBRARY_PNG
+      NAMES wxpng
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_lib"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
+      DOC "wxWindows static png library" )
+    
+    FIND_LIBRARY(WXWINDOWS_STATIC_DEBUG_LIBRARY_TIFF
+      NAMES wxtiffd 
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_lib"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
+      DOC "wxWindows static debug tiff library" )
+
+    FIND_LIBRARY(WXWINDOWS_STATIC_LIBRARY_TIFF
+      NAMES wxtiff
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_lib"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
+      DOC "wxWindows static tiff library" )
+    
+    FIND_LIBRARY(WXWINDOWS_STATIC_DEBUG_LIBRARY_JPEG
+      NAMES wxjpegd  wxjpgd
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_lib"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
+      DOC "wxWindows static debug jpeg library" )
+
+    FIND_LIBRARY(WXWINDOWS_STATIC_LIBRARY_JPEG
+      NAMES wxjpeg wxjpg
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_lib"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
+      DOC "wxWindows static jpeg library" )
+    
+    FIND_LIBRARY(WXWINDOWS_STATIC_DEBUG_LIBRARY_ZLIB
+      NAMES wxzlibd
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_lib"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
+      DOC "wxWindows static debug zlib library" )
+
+    FIND_LIBRARY(WXWINDOWS_STATIC_LIBRARY_ZLIB
+      NAMES wxzlib
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_lib"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
+      DOC "wxWindows static zib library" )
+
+    FIND_LIBRARY(WXWINDOWS_STATIC_DEBUG_LIBRARY_REGEX
+      NAMES wxregexd
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_lib"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
+      DOC "wxWindows static debug regex library" )
+
+    FIND_LIBRARY(WXWINDOWS_STATIC_LIBRARY_REGEX
+      NAMES wxregex
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_lib"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
+      DOC "wxWindows static regex library" )
+    
+    
+    
+    ## untested:
+    FIND_LIBRARY(WXWINDOWS_SHARED_LIBRARY_GL
+      NAMES wx_gl wxmsw_gl wxmsw26_gl 
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_dll"
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
+      DOC "wxWindows shared release build GL library" )
+
+    FIND_LIBRARY(WXWINDOWS_SHARED_DEBUG_LIBRARY_GL
+      NAMES wxd_gl wxmswd_gl wxmsw26d_gl 
+      PATHS 
+      "${WXWINDOWS_ROOT_DIR}/lib/vc_dll"      
+      ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
+      DOC "wxWindows shared debug build GL library" )            
+    
+    
+  ELSE (WXWINDOWS_USE_MONOLITHIC)
+    ## WX is built as multiple small pieces libraries instead of monolithic
+    
+    ## DEPECATED (jw) replaced by more general WXWINDOWS_USE_MONOLITHIC ON/OFF
+    # OPTION(WXWINDOWS_SEPARATE_LIBS_BUILD "Is wxWindows build with separate libs?" OFF)    
+    
+    ## HACK: This is very dirty.
+    ## because the libs of a particular version are explicitly listed
+    ## and NOT searched/verified.
+    ## TODO:  Really search for each lib, then decide for 
+    ## monolithic x debug x shared x GL (=16 combinations) for at least 18 libs 
+    ## -->  about 288 combinations 
+    ## thus we need a different approach so solve this correctly ...
+    
+    MESSAGE(STATUS "Warning: You are trying to use wxWidgets without monolithic build (WXWINDOWS_SEPARATE_LIBS_BUILD). This is a HACK, libraries are not verified! (JW).")
+    
+    SET(WXWINDOWS_STATIC_LIBS ${WXWINDOWS_STATIC_LIBS}
+      wxbase26
+      wxbase26_net
+      wxbase26_odbc
+      wxbase26_xml
+      wxmsw26_adv
+      wxmsw26_core
+      wxmsw26_dbgrid
+      wxmsw26_gl
+      wxmsw26_html
+      wxmsw26_media
+      wxmsw26_qa
+      wxmsw26_xrc
+      wxexpat
+      wxjpeg
+      wxpng
+      wxregex
+      wxtiff
+      wxzlib
+      comctl32
+      rpcrt4
+      wsock32
+      )
+    ## HACK: feed in to optimized / debug libaries if both were FOUND. 
+    SET(WXWINDOWS_STATIC_DEBUG_LIBS ${WXWINDOWS_STATIC_DEBUG_LIBS}
+      wxbase26d
+      wxbase26d_net
+      wxbase26d_odbc
+      wxbase26d_xml
+      wxmsw26d_adv
+      wxmsw26d_core
+      wxmsw26d_dbgrid
+      wxmsw26d_gl
+      wxmsw26d_html
+      wxmsw26d_media
+      wxmsw26d_qa
+      wxmsw26d_xrc
+      wxexpatd
+      wxjpegd
+      wxpngd
+      wxregexd
+      wxtiffd
+      wxzlibd
+      comctl32
+      rpcrt4
+      wsock32
+      )
+  ENDIF (WXWINDOWS_USE_MONOLITHIC)
   
-  FIND_LIBRARY(WXWINDOWS_SHARED_DEBUG_LIBRARY
-    NAMES wxmsw24d wxmsw241d wxmsw240d wx23_2d wx22_9d 
-    PATHS ${WXWINDOWS_POSSIBLE_LIB_PATHS} 
-    DOC "wxWindows shared debug build library " )
   
+  ##
+  ## now we should have found all WX libs available on the system.
+  ## let the user decide which of the available onse to use.
+  ## 
   
-  # if there is at least one shared lib available
-  # let user choose wether to use shared or static wxwindows libs 
+  ## if there is at least one shared lib available
+  ## let user choose wether to use shared or static wxwindows libs 
   IF(WXWINDOWS_SHARED_LIBRARY OR WXWINDOWS_SHARED_DEBUG_LIBRARY)
-    # default value OFF because wxWindows MSVS default build is static
+    ## default value OFF because wxWindows MSVS default build is static
     OPTION(WXWINDOWS_USE_SHARED_LIBS
       "Use shared versions (dll) of wxWindows libraries?" OFF)
     MARK_AS_ADVANCED(WXWINDOWS_USE_SHARED_LIBS)
-  ENDIF(WXWINDOWS_SHARED_LIBRARY OR WXWINDOWS_SHARED_DEBUG_LIBRARY)
+  ENDIF(WXWINDOWS_SHARED_LIBRARY OR WXWINDOWS_SHARED_DEBUG_LIBRARY)    
   
-  
-  # add system libraries wxwindows depends on
-  SET(CMAKE_WXWINDOWS_LIBRARIES ${CMAKE_WXWINDOWS_LIBRARIES}
+  ## add system libraries wxwindows always seems to depend on
+  SET(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES}
     comctl32
     rpcrt4
     wsock32
-    #  presumably ctl3d32 is not neccesary (Jan Woetzel 07/2003)
-    #   ctl3d32
-    #    debug ${WXWINDOWS_ROOT_DIR}/lib/zlibd.lib  optimized ${WXWINDOWS_ROOT_DIR}/lib/zlibd.lib
-    #    debug ${WXWINDOWS_ROOT_DIR}/lib/regexd.lib optimized ${WXWINDOWS_ROOT_DIR}/lib/regexd.lib 
-    #    debug ${WXWINDOWS_ROOT_DIR}/lib/pngd.lib   optimized ${WXWINDOWS_ROOT_DIR}/lib/pngd.lib
-    #    debug ${WXWINDOWS_ROOT_DIR}/lib/jpegd.lib  optimized ${WXWINDOWS_ROOT_DIR}/lib/jpegd.lib
-    #    debug ${WXWINDOWS_ROOT_DIR}/lib/tiffd.lib  optimized ${WXWINDOWS_ROOT_DIR}/lib/tiff.lib
-    )
-  
-  # JW removed option and force the develper th SET it. 
-  # OPTION(WXWINDOWS_USE_GL "use wxWindows with GL support (use additional
-  # opengl, glu libs)?" OFF)
+    )  
   
-  # opengl/glu: (TODO/FIXME: better use FindOpenGL.cmake here 
+  IF (NOT WXWINDOWS_USE_SHARED_LIBS)
+    SET(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES}
+      ##  these ones dont seem required, in particular  ctl3d32 is not neccesary (Jan Woetzel 07/2003)
+      #   ctl3d32
+      debug ${WXWINDOWS_STATIC_DEBUG_LIBRARY_ZLIB}   optimized ${WXWINDOWS_STATIC_LIBRARY_ZLIB}
+      debug ${WXWINDOWS_STATIC_DEBUG_LIBRARY_REGEX}  optimized ${WXWINDOWS_STATIC_LIBRARY_REGEX}
+      debug ${WXWINDOWS_STATIC_DEBUG_LIBRARY_PNG}    optimized ${WXWINDOWS_STATIC_LIBRARY_PNG}
+      debug ${WXWINDOWS_STATIC_DEBUG_LIBRARY_JPEG}   optimized ${WXWINDOWS_STATIC_LIBRARY_JPEG}
+      debug ${WXWINDOWS_STATIC_DEBUG_LIBRARY_TIFF}   optimized ${WXWINDOWS_STATIC_LIBRARY_TIFF}
+      )
+  ENDIF (NOT WXWINDOWS_USE_SHARED_LIBS)
+
+  ## opengl/glu: TODO/FIXME: better use FindOpenGL.cmake here 
+  ## assume release versions of glu an dopengl, here.
   IF (WXWINDOWS_USE_GL)
-    SET(CMAKE_WXWINDOWS_LIBRARIES ${CMAKE_WXWINDOWS_LIBRARIES}
+    SET(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES}
       opengl32
-      glu32
-      )
+      glu32 )
   ENDIF (WXWINDOWS_USE_GL)
   
-  
-  #
-  # select between use of  shared or static wxWindows lib then set libs to use
-  # for debug and optimized build.  so the user can switch between debug and
-  # release build e.g. within MS Visual Studio without running cmake with a
-  # different build directory again.
-  # 
-  # then add the build specific include dir for wx/setup.h
-  # 
+  ##
+  ## select between use of  shared or static wxWindows lib then set libs to use
+  ## for debug and optimized build.  so the user can switch between debug and
+  ## release build e.g. within MS Visual Studio without running cmake with a
+  ## different build directory again.
+  ## 
+  ## then add the build specific include dir for wx/setup.h
+  ## 
   
   IF(WXWINDOWS_USE_SHARED_LIBS)
-    #MESSAGE("DBG wxWindows use shared lib selected.")
+    ##MESSAGE("DBG wxWindows use shared lib selected.")
+    ## assume that both builds use the same setup(.h) for simplicity
     
-    # shared: both wx (debug and release) found?
+    ## shared: both wx (debug and release) found?
+    ## assume that both builds use the same setup(.h) for simplicity
     IF(WXWINDOWS_SHARED_DEBUG_LIBRARY AND WXWINDOWS_SHARED_LIBRARY)
-      #MESSAGE("DBG wx shared: debug and optimized found.")
-      SET(WXWINDOWS_LIBRARIES ${CMAKE_WXWINDOWS_LIBRARIES}
-        debug     ${WXWINDOWS_SHARED_DEBUG_LIBRARY}
-        optimized ${WXWINDOWS_SHARED_LIBRARY} )
+      ##MESSAGE("DBG wx shared: debug and optimized found.")
       FIND_PATH(WXWINDOWS_INCLUDE_DIR_SETUPH  wx/setup.h
         ${WXWINDOWS_ROOT_DIR}/lib/mswdlld
-        ${WXWINDOWS_ROOT_DIR}/lib/mswdll )
+        ${WXWINDOWS_ROOT_DIR}/lib/mswdll 
+        ${WXWINDOWS_ROOT_DIR}/lib/vc_dll/mswd
+        ${WXWINDOWS_ROOT_DIR}/lib/vc_dll/msw )
+      SET(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES}
+        debug     ${WXWINDOWS_SHARED_DEBUG_LIBRARY}
+        optimized ${WXWINDOWS_SHARED_LIBRARY} )
+      IF (WXWINDOWS_USE_GL)
+        SET(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES}
+          debug     ${WXWINDOWS_SHARED_DEBUG_LIBRARY_GL}
+          optimized ${WXWINDOWS_SHARED_LIBRARY_GL} )
+      ENDIF (WXWINDOWS_USE_GL)
     ENDIF(WXWINDOWS_SHARED_DEBUG_LIBRARY AND WXWINDOWS_SHARED_LIBRARY)
     
-    # shared: only debug wx lib found?
+    ## shared: only debug wx lib found?
     IF(WXWINDOWS_SHARED_DEBUG_LIBRARY)
       IF(NOT WXWINDOWS_SHARED_LIBRARY)
-        #MESSAGE("DBG wx shared: debug (but no optimized) found.")
-        SET(WXWINDOWS_LIBRARIES ${CMAKE_WXWINDOWS_LIBRARIES}
-          ${WXWINDOWS_SHARED_DEBUG_LIBRARY} )
+        ##MESSAGE("DBG wx shared: debug (but no optimized) found.")
         FIND_PATH(WXWINDOWS_INCLUDE_DIR_SETUPH  wx/setup.h
-          ${WXWINDOWS_ROOT_DIR}/lib/mswdlld )
+          ${WXWINDOWS_ROOT_DIR}/lib/mswdlld 
+          ${WXWINDOWS_ROOT_DIR}/lib/vc_dll/mswd  )        
+        SET(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES}
+          ${WXWINDOWS_SHARED_DEBUG_LIBRARY} )
+        IF (WXWINDOWS_USE_GL) 
+          SET(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES}
+            ${WXWINDOWS_SHARED_DEBUG_LIBRARY_GL} )
+        ENDIF (WXWINDOWS_USE_GL)
       ENDIF(NOT WXWINDOWS_SHARED_LIBRARY)
     ENDIF(WXWINDOWS_SHARED_DEBUG_LIBRARY)
     
-    # shared: only release wx lib found?
+    ## shared: only release wx lib found?
     IF(NOT WXWINDOWS_SHARED_DEBUG_LIBRARY)
       IF(WXWINDOWS_SHARED_LIBRARY)
-        #MESSAGE("DBG wx shared: optimized (but no debug) found.")
-        SET(WXWINDOWS_LIBRARIES ${CMAKE_WXWINDOWS_LIBRARIES}
-          ${WXWINDOWS_SHARED_DEBUG_LIBRARY} )
+        ##MESSAGE("DBG wx shared: optimized (but no debug) found.")
         FIND_PATH(WXWINDOWS_INCLUDE_DIR_SETUPH  wx/setup.h
-          ${WXWINDOWS_ROOT_DIR}/lib/mswdll )
+          ${WXWINDOWS_ROOT_DIR}/lib/mswdll 
+          ${WXWINDOWS_ROOT_DIR}/lib/vc_dll/msw  )
+        SET(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES}
+          ${WXWINDOWS_SHARED_DEBUG_LIBRARY} )
+        IF (WXWINDOWS_USE_GL)
+          SET(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES}
+            ${WXWINDOWS_SHARED_DEBUG_LIBRARY_GL} )
+        ENDIF (WXWINDOWS_USE_GL)
       ENDIF(WXWINDOWS_SHARED_LIBRARY)    
     ENDIF(NOT WXWINDOWS_SHARED_DEBUG_LIBRARY)
     
-    # shared: none found?
+    ## shared: none found?
     IF(NOT WXWINDOWS_SHARED_DEBUG_LIBRARY)
       IF(NOT WXWINDOWS_SHARED_LIBRARY)
-        MESSAGE(SEND_ERROR 
+        MESSAGE(STATUS  
           "No shared wxWindows lib found, but WXWINDOWS_USE_SHARED_LIBS=${WXWINDOWS_USE_SHARED_LIBS}.")
       ENDIF(NOT WXWINDOWS_SHARED_LIBRARY)
     ENDIF(NOT WXWINDOWS_SHARED_DEBUG_LIBRARY)
 
-
+    #########################################################################################
   ELSE(WXWINDOWS_USE_SHARED_LIBS)
-    #MESSAGE("DBG wxWindows static lib selected.")
 
-    # static: both wx (debug and release) found?
+    ##jw: DEPRECATED IF(NOT WXWINDOWS_SEPARATE_LIBS_BUILD)
+    
+    ## static: both wx (debug and release) found?
+    ## assume that both builds use the same setup(.h) for simplicity
     IF(WXWINDOWS_STATIC_DEBUG_LIBRARY AND WXWINDOWS_STATIC_LIBRARY)
-      #MESSAGE("DBG wx static: debug and optimized found.")
-      SET(WXWINDOWS_LIBRARIES ${CMAKE_WXWINDOWS_LIBRARIES}
-        debug     ${WXWINDOWS_STATIC_DEBUG_LIBRARY}
-        optimized ${WXWINDOWS_STATIC_LIBRARY} )
+      ##MESSAGE("DBG wx static: debug and optimized found.")
       FIND_PATH(WXWINDOWS_INCLUDE_DIR_SETUPH  wx/setup.h
         ${WXWINDOWS_ROOT_DIR}/lib/mswd
-        ${WXWINDOWS_ROOT_DIR}/lib/msw )
+        ${WXWINDOWS_ROOT_DIR}/lib/msw 
+        ${WXWINDOWS_ROOT_DIR}/lib/vc_lib/mswd 
+        ${WXWINDOWS_ROOT_DIR}/lib/vc_lib/msw )
+      SET(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES}
+        debug     ${WXWINDOWS_STATIC_DEBUG_LIBRARY}
+        optimized ${WXWINDOWS_STATIC_LIBRARY} )
+      IF (WXWINDOWS_USE_GL)
+        SET(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES}
+          debug     ${WXWINDOWS_STATIC_DEBUG_LIBRARY_GL}
+          optimized ${WXWINDOWS_STATIC_LIBRARY_GL} )
+      ENDIF (WXWINDOWS_USE_GL)          
     ENDIF(WXWINDOWS_STATIC_DEBUG_LIBRARY AND WXWINDOWS_STATIC_LIBRARY)
     
-    # static: only debug wx lib found?
+    ## static: only debug wx lib found?
     IF(WXWINDOWS_STATIC_DEBUG_LIBRARY)
       IF(NOT WXWINDOWS_STATIC_LIBRARY)
-        #MESSAGE("DBG wx static: debug (but no optimized) found.")
-        SET(WXWINDOWS_LIBRARIES ${CMAKE_WXWINDOWS_LIBRARIES}
-          ${WXWINDOWS_STATIC_DEBUG_LIBRARY} )
+        ##MESSAGE("DBG wx static: debug (but no optimized) found.")
         FIND_PATH(WXWINDOWS_INCLUDE_DIR_SETUPH  wx/setup.h
-          ${WXWINDOWS_ROOT_DIR}/lib/mswd )
+          ${WXWINDOWS_ROOT_DIR}/lib/mswd 
+          ${WXWINDOWS_ROOT_DIR}/lib/vc_lib/mswd  )
+        SET(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES}
+          ${WXWINDOWS_STATIC_DEBUG_LIBRARY} )
+        IF (WXWINDOWS_USE_GL)           
+          SET(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES}
+            ${WXWINDOWS_STATIC_DEBUG_LIBRARY_GL} )
+        ENDIF (WXWINDOWS_USE_GL)
       ENDIF(NOT WXWINDOWS_STATIC_LIBRARY)
     ENDIF(WXWINDOWS_STATIC_DEBUG_LIBRARY)
     
-    # static: only release wx lib found?
+    ## static: only release wx lib found?
     IF(NOT WXWINDOWS_STATIC_DEBUG_LIBRARY)
       IF(WXWINDOWS_STATIC_LIBRARY)
-        #MESSAGE("DBG wx static: optimized (but no debug) found.")
-        SET(WXWINDOWS_LIBRARIES ${CMAKE_WXWINDOWS_LIBRARIES}
-          ${WXWINDOWS_STATIC_DEBUG_LIBRARY} )
+        ##MESSAGE("DBG wx static: optimized (but no debug) found.")
         FIND_PATH(WXWINDOWS_INCLUDE_DIR_SETUPH  wx/setup.h
-          ${WXWINDOWS_ROOT_DIR}/lib/msw )
+          ${WXWINDOWS_ROOT_DIR}/lib/msw 
+          ${WXWINDOWS_ROOT_DIR}/lib/vc_lib/msw ) 
+        SET(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES}
+          ${WXWINDOWS_STATIC_LIBRARY} )
+        IF (WXWINDOWS_USE_GL)                           
+          SET(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES}
+            ${WXWINDOWS_STATIC_LIBRARY_GL} )
+        ENDIF (WXWINDOWS_USE_GL)                
       ENDIF(WXWINDOWS_STATIC_LIBRARY)
     ENDIF(NOT WXWINDOWS_STATIC_DEBUG_LIBRARY)
     
-    # static: none found?
-    IF(NOT WXWINDOWS_STATIC_DEBUG_LIBRARY)
+    ## static: none found?
+    IF(NOT WXWINDOWS_STATIC_DEBUG_LIBRARY AND NOT WXWINDOWS_SEPARATE_LIBS_BUILD)
       IF(NOT WXWINDOWS_STATIC_LIBRARY)
-        MESSAGE(SEND_ERROR 
+        MESSAGE(STATUS 
           "No static wxWindows lib found, but WXWINDOWS_USE_SHARED_LIBS=${WXWINDOWS_USE_SHARED_LIBS}.")
       ENDIF(NOT WXWINDOWS_STATIC_LIBRARY)
-    ENDIF(NOT WXWINDOWS_STATIC_DEBUG_LIBRARY)
-    
+    ENDIF(NOT WXWINDOWS_STATIC_DEBUG_LIBRARY AND NOT WXWINDOWS_SEPARATE_LIBS_BUILD)      
   ENDIF(WXWINDOWS_USE_SHARED_LIBS)  
   
   
-  # not neccessary in wxWindows 2.4.1 
-  # but it may fix a previous bug, see
-  # http://lists.wxwindows.org/cgi-bin/ezmlm-cgi?8:mss:37574:200305:mpdioeneabobmgjenoap
+  ## not neccessary in wxWindows 2.4.1 and 2.6.2
+  ## but it may fix a previous bug, see
+  ## http://lists.wxwindows.org/cgi-bin/ezmlm-cgi?8:mss:37574:200305:mpdioeneabobmgjenoap
   OPTION(WXWINDOWS_SET_DEFINITIONS "Set additional defines for wxWindows" OFF)
   MARK_AS_ADVANCED(WXWINDOWS_SET_DEFINITIONS)
   IF (WXWINDOWS_SET_DEFINITIONS) 
@@ -260,52 +523,67 @@ IF(WIN32_STYLE_FIND)
   ENDIF (WXWINDOWS_SET_DEFINITIONS) 
   
   
-  # Find the include directories for wxwindows
-  # the first, build specific for wx/setup.h was determined before.
-  # add inc dir for general for "wx/wx.h" 
-  SET (WXWINDOWS_POSSIBLE_INCLUDE_PATHS
-    "${WXWINDOWS_ROOT_DIR}/include"
-    )
+  
+  ## Find the include directories for wxwindows
+  ## the first, build specific for wx/setup.h was determined before.
+  ## add inc dir for general for "wx/wx.h"
   FIND_PATH(WXWINDOWS_INCLUDE_DIR  wx/wx.h 
-    ${WXWINDOWS_POSSIBLE_INCLUDE_PATHS}
-    )  
-  # append the build specific include dir for wx/setup.h:
+    "${WXWINDOWS_ROOT_DIR}/include" )  
+  ## append the build specific include dir for wx/setup.h:
   IF (WXWINDOWS_INCLUDE_DIR_SETUPH)
     SET(WXWINDOWS_INCLUDE_DIR ${WXWINDOWS_INCLUDE_DIR} ${WXWINDOWS_INCLUDE_DIR_SETUPH} )
   ENDIF (WXWINDOWS_INCLUDE_DIR_SETUPH)
   
+  
+  
   MARK_AS_ADVANCED(
     WXWINDOWS_ROOT_DIR
     WXWINDOWS_INCLUDE_DIR
     WXWINDOWS_INCLUDE_DIR_SETUPH
     WXWINDOWS_STATIC_LIBRARY
+    WXWINDOWS_STATIC_LIBRARY_GL
     WXWINDOWS_STATIC_DEBUG_LIBRARY
+    WXWINDOWS_STATIC_DEBUG_LIBRARY_GL
+    WXWINDOWS_STATIC_LIBRARY_ZLIB
+    WXWINDOWS_STATIC_DEBUG_LIBRARY_ZLIB
+    WXWINDOWS_STATIC_LIBRARY_REGEX
+    WXWINDOWS_STATIC_DEBUG_LIBRARY_REGEX
+    WXWINDOWS_STATIC_LIBRARY_PNG
+    WXWINDOWS_STATIC_DEBUG_LIBRARY_PNG
+    WXWINDOWS_STATIC_LIBRARY_JPEG
+    WXWINDOWS_STATIC_DEBUG_LIBRARY_JPEG
+    WXWINDOWS_STATIC_DEBUG_LIBRARY_TIFF
+    WXWINDOWS_STATIC_LIBRARY_TIFF
     WXWINDOWS_SHARED_LIBRARY
     WXWINDOWS_SHARED_DEBUG_LIBRARY
+    WXWINDOWS_SHARED_LIBRARY_GL
+    WXWINDOWS_SHARED_DEBUG_LIBRARY_GL    
     )
   
   
 ELSE(WIN32_STYLE_FIND)
+
   IF (UNIX_STYLE_FIND) 
-    # ###################################
-    # 
-    # UNIX/Linux specific:
-    # 
-    # use backquoted wx-config to query and set flags and libs:
-    # 06/2003 Jan Woetzel
-    # 
+    ## ######################################################################
+    ## 
+    ## UNIX/Linux specific:
+    ## 
+    ## use backquoted wx-config to query and set flags and libs:
+    ## 06/2003 Jan Woetzel
+    ## 
     
     OPTION(WXWINDOWS_USE_SHARED_LIBS "Use shared versions (.so) of wxWindows libraries" ON)
     MARK_AS_ADVANCED(WXWINDOWS_USE_SHARED_LIBS)
 
     # JW removed option and force the develper th SET it. 
     # OPTION(WXWINDOWS_USE_GL "use wxWindows with GL support (use additional
-    # --gl-libs for wx-config)?" OFF)
+      # --gl-libs for wx-config)?" OFF)
     
     # wx-config should be in your path anyhow, usually no need to set WXWIN or
     # search in ../wx or ../../wx
     FIND_PROGRAM(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE wx-config
       $ENV{WXWIN}
+      $ENV{WXWIN}/bin
       ../wx/bin
       ../../wx/bin )
     
@@ -314,7 +592,7 @@ ELSE(WIN32_STYLE_FIND)
 
       # use shared/static wx lib?
       # remember: always link shared to use systems GL etc. libs (no static
-      # linking, just link *against* static .a libs)
+        # linking, just link *against* static .a libs)
       IF(WXWINDOWS_USE_SHARED_LIBS)
         SET(WX_CONFIG_ARGS_LIBS "--libs")
       ELSE(WXWINDOWS_USE_SHARED_LIBS)
@@ -325,17 +603,17 @@ ELSE(WIN32_STYLE_FIND)
       IF(WXWINDOWS_USE_GL)
         SET(WX_CONFIG_ARGS_LIBS "${WX_CONFIG_ARGS_LIBS} --gl-libs" )
       ENDIF(WXWINDOWS_USE_GL)
-      #MESSAGE("DBG: WX_CONFIG_ARGS_LIBS=${WX_CONFIG_ARGS_LIBS}===")
+      ##MESSAGE("DBG: WX_CONFIG_ARGS_LIBS=${WX_CONFIG_ARGS_LIBS}===")
       
       # set CXXFLAGS to be fed into CMAKE_CXX_FLAGS by the user:
-      SET(CMAKE_WXWINDOWS_CXX_FLAGS "`${CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE} --cxxflags`")
-      #MESSAGE("DBG: for compilation:
-      #CMAKE_WXWINDOWS_CXX_FLAGS=${CMAKE_WXWINDOWS_CXX_FLAGS}===")
+      SET(CMAKE_WXWINDOWS_CXX_FLAGS "`${CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE} --cxxflags|sed -e s/-I/-isystem/g`")
+      ##MESSAGE("DBG: for compilation:
+        ##CMAKE_WXWINDOWS_CXX_FLAGS=${CMAKE_WXWINDOWS_CXX_FLAGS}===")
 
       # keep the back-quoted string for clarity
       SET(WXWINDOWS_LIBRARIES "`${CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE} ${WX_CONFIG_ARGS_LIBS}`")
-      #MESSAGE("DBG2: for linking:
-      #WXWINDOWS_LIBRARIES=${WXWINDOWS_LIBRARIES}===")
+      ##MESSAGE("DBG2: for linking:
+        ##WXWINDOWS_LIBRARIES=${WXWINDOWS_LIBRARIES}===")
       
       # evaluate wx-config output to separate linker flags and linkdirs for
       # rpath:
@@ -343,23 +621,23 @@ ELSE(WIN32_STYLE_FIND)
         ARGS ${WX_CONFIG_ARGS_LIBS}
         OUTPUT_VARIABLE WX_CONFIG_LIBS )
       
-      # extract linkdirs (-L) for rpath
-      # use regular expression to match wildcard equivalent "-L*<endchar>"
-      # with <endchar> is a space or a semicolon
+      ## extract linkdirs (-L) for rpath
+      ## use regular expression to match wildcard equivalent "-L*<endchar>"
+      ## with <endchar> is a space or a semicolon
       STRING(REGEX MATCHALL "[-][L]([^ ;])+" WXWINDOWS_LINK_DIRECTORIES_WITH_PREFIX "${WX_CONFIG_LIBS}" )
-      #MESSAGE("DBG  WXWINDOWS_LINK_DIRECTORIES_WITH_PREFIX=${WXWINDOWS_LINK_DIRECTORIES_WITH_PREFIX}")
+      # MESSAGE("DBG  WXWINDOWS_LINK_DIRECTORIES_WITH_PREFIX=${WXWINDOWS_LINK_DIRECTORIES_WITH_PREFIX}")
       
-      # remove prefix -L because we need the pure directory for LINK_DIRECTORIES
-      # replace -L by ; because the separator seems to be lost otherwise (bug or
-      # feature?)
+      ## remove prefix -L because we need the pure directory for LINK_DIRECTORIES
+      ## replace -L by ; because the separator seems to be lost otherwise (bug or
+        ## feature?)
       IF(WXWINDOWS_LINK_DIRECTORIES_WITH_PREFIX)
         STRING(REGEX REPLACE "[-][L]" ";" WXWINDOWS_LINK_DIRECTORIES ${WXWINDOWS_LINK_DIRECTORIES_WITH_PREFIX} )
-        #MESSAGE("DBG  WXWINDOWS_LINK_DIRECTORIES=${WXWINDOWS_LINK_DIRECTORIES}")
+        # MESSAGE("DBG  WXWINDOWS_LINK_DIRECTORIES=${WXWINDOWS_LINK_DIRECTORIES}")
       ENDIF(WXWINDOWS_LINK_DIRECTORIES_WITH_PREFIX)
-
       
-      # replace space separated string by semicolon separated vector to make it
-      # work with LINK_DIRECTORIES
+      
+      ## replace space separated string by semicolon separated vector to make it
+      ## work with LINK_DIRECTORIES
       SEPARATE_ARGUMENTS(WXWINDOWS_LINK_DIRECTORIES)
       
       MARK_AS_ADVANCED(
@@ -370,30 +648,30 @@ ELSE(WIN32_STYLE_FIND)
         )
       
       
-      # we really need wx-config...
+      ## we really need wx-config...
     ELSE(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE)    
-      MESSAGE(SEND_ERROR "Cannot find wx-config anywhere on the system. Please put the file into your path or specify it in CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE.")
+      MESSAGE(STATUS "Cannot find wx-config anywhere on the system. Please put the file into your path or specify it in CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE.")
       MARK_AS_ADVANCED(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE)
     ENDIF(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE)
 
     
     
   ELSE(UNIX_STYLE_FIND)
-    MESSAGE(SEND_ERROR "FindwxWindows.cmake:  Platform unknown/unsupported by FindwxWindows.cmake. It's neither WIN32 nor UNIX")
+    MESSAGE(STATUS "FindwxWindows.cmake:  Platform unknown/unsupported by FindwxWindows.cmake. It's neither WIN32 nor UNIX")
   ENDIF(UNIX_STYLE_FIND)
 ENDIF(WIN32_STYLE_FIND)
 
 
 IF(WXWINDOWS_LIBRARIES)
   IF(WXWINDOWS_INCLUDE_DIR OR CMAKE_WXWINDOWS_CXX_FLAGS)
-    
-    # found all we need.
+    ## found all we need.
     SET(WXWINDOWS_FOUND 1)
     
-    # set deprecated variables for backward compatibility: 
+    ## set deprecated variables for backward compatibility: 
     SET(CMAKE_WX_CAN_COMPILE   ${WXWINDOWS_FOUND})
-    SET(WXWINDOWS_LIBRARY      ${WXWINDOWS_LIBRARIES})
+    SET(WXWINDOWS_LIBRARY     ${WXWINDOWS_LIBRARIES})
     SET(WXWINDOWS_INCLUDE_PATH ${WXWINDOWS_INCLUDE_DIR})
+    SET(WXWINDOWS_LINK_DIRECTORIES ${WXWINDOWS_LINK_DIRECTORIES})
     SET(CMAKE_WX_CXX_FLAGS     ${CMAKE_WXWINDOWS_CXX_FLAGS})
     
   ENDIF(WXWINDOWS_INCLUDE_DIR OR CMAKE_WXWINDOWS_CXX_FLAGS)