[cmake-commits] miguelf committed FindwxWidgets.cmake 1.16 1.17

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv6310

Modified Files:
	FindwxWidgets.cmake 
Log Message:
BUG: Support cross-compiling; wx-config should be searched for in target platform ONLY (bug 6187).


Index: FindwxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindwxWidgets.cmake,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- FindwxWidgets.cmake	5 Jan 2008 16:19:29 -0000	1.16
+++ FindwxWidgets.cmake	6 Jan 2008 01:37:51 -0000	1.17
@@ -619,7 +619,11 @@
     #-----------------------------------------------------------------
     # UNIX: Start actual work.
     #-----------------------------------------------------------------
-    FIND_PROGRAM(wxWidgets_CONFIG_EXECUTABLE wx-config)
+    # 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)
 
@@ -664,9 +668,6 @@
         STRING(REPLACE "-I" ""
           wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}")
 
-        # convert space to semicolons for list
-#        SEPARATE_ARGUMENTS(wxWidgets_INCLUDE_DIRS)
-
         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}")
@@ -706,9 +707,6 @@
         STRING(REPLACE "-L" ""
           wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARY_DIRS}")
 
-        # convert space to semicolons for list
-#        SEPARATE_ARGUMENTS(wxWidgets_LIBRARY_DIRS)
-
         DBG_MSG_V("wxWidgets_LIBRARIES=${wxWidgets_LIBRARIES}")
         DBG_MSG_V("wxWidgets_LIBRARY_DIRS=${wxWidgets_LIBRARY_DIRS}")