kicad-developers team mailing list archive

[Simon Richter <Simon.Richter@xxxxxxxxxx>]

---
 CMakeModules/FindwxWidgets.cmake | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/CMakeModules/FindwxWidgets.cmake b/CMakeModules/FindwxWidgets.cmake
index 55e057d..eed7166 100644
--- a/CMakeModules/FindwxWidgets.cmake
+++ b/CMakeModules/FindwxWidgets.cmake
@@ -192,25 +192,18 @@ else()
 endif()
 
 #=====================================================================
+# Determine whether unix or win32 paths should be used
 #=====================================================================
-
-
-if(WIN32 AND NOT CYGWIN AND NOT MSYS AND NOT CMAKE_HOST_UNIX )
-  dbg_msg( "setting win32 style" )
+if(WIN32 AND NOT CYGWIN AND NOT MSYS AND NOT CMAKE_CROSSCOMPILING)
   set(wxWidgets_FIND_STYLE "win32")
 else()
-  if(CMAKE_HOST_UNIX OR MSYS)
-    dbg_msg( "unix style" )
-    set(wxWidgets_FIND_STYLE "unix")
-  endif()
+  set(wxWidgets_FIND_STYLE "unix")
 endif()
 
 #=====================================================================
 # WIN32_FIND_STYLE
 #=====================================================================
 if(wxWidgets_FIND_STYLE STREQUAL "win32")
-  dbg_msg("Using win32 path")
-
   # Useful common wx libs needed by almost all components.
   set(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
 
@@ -269,8 +262,6 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
     mark_as_advanced(WX_${LIB}${_DBG})
     endforeach()
 
-    dbg_msg( "WX_LIB_DIR:${WX_LIB_DIR}" )
-
     # Find wxWidgets multilib base libraries.
     find_library(WX_base${_DBG}
       NAMES
@@ -475,8 +466,6 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
 
   # If wxWidgets_ROOT_DIR changed, clear lib dir.
   if(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
-    dbg_msg( "WX_ROOT_DIR != wxWidgets_ROOT_DIR" )
-
     set(WX_ROOT_DIR ${wxWidgets_ROOT_DIR}
         CACHE INTERNAL "wxWidgets_ROOT_DIR")
     set(wxWidgets_LIB_DIR "wxWidgets_LIB_DIR-NOTFOUND"
@@ -484,19 +473,15 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
   endif()
 
   if(WX_ROOT_DIR)
-    dbg_msg( "WX_ROOT_DIR == wxWidgets_ROOT_DIR" )
-
     # Select one default tree inside the already determined wx tree.
     # Prefer static/shared order usually consistent with build
     # settings.
     if(MINGW)
-      dbg_msg( "MINGW" )
       set(WX_LIB_DIR_PREFIX gcc)
     else()
       set(WX_LIB_DIR_PREFIX vc)
     endif()
     if(BUILD_SHARED_LIBS)
-      dbg_msg( "BUILD_SHARED_LIBS" )
       find_path(wxWidgets_LIB_DIR
         NAMES
           msw/wx/setup.h
@@ -510,11 +495,10 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
         PATHS
         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll   # prefer shared
         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib
-        DOC "Path to wxWidgets libraries?"
+        DOC "Path to wxWidgets libraries"
         NO_DEFAULT_PATH
         )
     else()
-      dbg_msg( "!BUILD_SHARED_LIBS  WX_LIB_DIR:${WX_LIB_DIR}" )
       find_path(wxWidgets_LIB_DIR
         NAMES
           msw/wx/setup.h
@@ -632,11 +616,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
 # UNIX_FIND_STYLE
 #=====================================================================
 else()
-  dbg_msg("NOT win32 path")
-
   if(wxWidgets_FIND_STYLE STREQUAL "unix")
-    dbg_msg("unix find style")
-
     #-----------------------------------------------------------------
     # UNIX: Helper MACROS
     #-----------------------------------------------------------------
@@ -908,7 +888,6 @@ dbg_msg("wxWidgets_VERSION_PATCH   : ${wxWidgets_VERSION_PATCH}")
 #=====================================================================
 #=====================================================================
 # Maintain consistency with all other variables.
-dbg_msg("wxWidgets_FOUND           : ${wxWidgets_FOUND}")
 set(WXWIDGETS_FOUND ${wxWidgetsS_FOUND})
 
 include(FindPackageHandleStandardArgs)