From 4c6dcc0ed94b48062f3a11ea54c194191c885884 Mon Sep 17 00:00:00 2001 From: "Miguel A. Figueroa-Villanueva" Date: Sat, 5 Jan 2008 20:37:51 -0500 Subject: BUG: Support cross-compiling; wx-config should be searched for in target platform ONLY (bug 6187). --- Modules/FindwxWidgets.cmake | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 53803bd..a41e43a 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -619,7 +619,11 @@ ELSE(WIN32_STYLE_FIND) #----------------------------------------------------------------- # 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 @@ ELSE(WIN32_STYLE_FIND) 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 @@ ELSE(WIN32_STYLE_FIND) 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}") -- cgit v0.12