diff options
| author | Miguel A. Figueroa-Villanueva <miguelf@ieee.org> | 2008-01-06 01:37:51 (GMT) |
|---|---|---|
| committer | Miguel A. Figueroa-Villanueva <miguelf@ieee.org> | 2008-01-06 01:37:51 (GMT) |
| commit | 4c6dcc0ed94b48062f3a11ea54c194191c885884 (patch) | |
| tree | 02ac458439477bb1c513b34dabba768be09f5e33 /Modules/FindwxWidgets.cmake | |
| parent | d1f2e3ff97a81fdd1d688a4fc669a1f5e8a0bd01 (diff) | |
| download | CMake-4c6dcc0ed94b48062f3a11ea54c194191c885884.zip CMake-4c6dcc0ed94b48062f3a11ea54c194191c885884.tar.gz CMake-4c6dcc0ed94b48062f3a11ea54c194191c885884.tar.bz2 | |
BUG: Support cross-compiling; wx-config should be searched for in target platform ONLY (bug 6187).
Diffstat (limited to 'Modules/FindwxWidgets.cmake')
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 12 |
1 files 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}") |