kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Support cross-compiling; wx-config should be searched for in target platform ONLY (bug 6187).

Browse Source
This commit is contained in:
Miguel A. Figueroa-Villanueva 2008-01-05 20:37:51 -05:00
parent d1f2e3ff97
commit 4c6dcc0ed9
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/FindwxWidgets.cmake
View File

@ -619,7 +619,11 @@ ELSE(WIN32_STYLE_FIND)
#----------------------------------------------------------------- #-----------------------------------------------------------------
# UNIX: Start actual work. # 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) IF(wxWidgets_CONFIG_EXECUTABLE)
SET(wxWidgets_FOUND TRUE) SET(wxWidgets_FOUND TRUE)
@ -664,9 +668,6 @@ ELSE(WIN32_STYLE_FIND)
STRING(REPLACE "-I" "" STRING(REPLACE "-I" ""
wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}") 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_DEFINITIONS=${wxWidgets_DEFINITIONS}")
DBG_MSG_V("wxWidgets_INCLUDE_DIRS=${wxWidgets_INCLUDE_DIRS}") DBG_MSG_V("wxWidgets_INCLUDE_DIRS=${wxWidgets_INCLUDE_DIRS}")
DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}") DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
@ -706,9 +707,6 @@ ELSE(WIN32_STYLE_FIND)
STRING(REPLACE "-L" "" STRING(REPLACE "-L" ""
wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARY_DIRS}") 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_LIBRARIES=${wxWidgets_LIBRARIES}")
DBG_MSG_V("wxWidgets_LIBRARY_DIRS=${wxWidgets_LIBRARY_DIRS}") DBG_MSG_V("wxWidgets_LIBRARY_DIRS=${wxWidgets_LIBRARY_DIRS}")