BUG: Patch from Peter Visser to run wx-config from an MSYS prompt.
This commit is contained in:
parent
f5b118f5a1
commit
ff46146dfc
|
@ -539,8 +539,8 @@ ELSE(WIN32_STYLE_FIND)
|
||||||
SET(wxWidgets_FOUND TRUE)
|
SET(wxWidgets_FOUND TRUE)
|
||||||
|
|
||||||
# run the wx-config program to get cxxflags
|
# run the wx-config program to get cxxflags
|
||||||
EXEC_PROGRAM(${wxWidgets_CONFIG_EXECUTABLE}
|
EXEC_PROGRAM(sh
|
||||||
ARGS "--cxxflags"
|
ARGS "${wxWidgets_CONFIG_EXECUTABLE} --cxxflags"
|
||||||
OUTPUT_VARIABLE wxWidgets_CXX_FLAGS
|
OUTPUT_VARIABLE wxWidgets_CXX_FLAGS
|
||||||
RETURN_VALUE RET)
|
RETURN_VALUE RET)
|
||||||
IF(RET EQUAL 0)
|
IF(RET EQUAL 0)
|
||||||
|
@ -583,8 +583,8 @@ ELSE(WIN32_STYLE_FIND)
|
||||||
# be useful here...
|
# be useful here...
|
||||||
#STRING(REPLACE ";" "," wxWidgets_USE_LIBS "${wxWidgets_USE_LIBS}")
|
#STRING(REPLACE ";" "," wxWidgets_USE_LIBS "${wxWidgets_USE_LIBS}")
|
||||||
STRING(REGEX REPLACE ";" "," wxWidgets_USE_LIBS "${wxWidgets_USE_LIBS}")
|
STRING(REGEX REPLACE ";" "," wxWidgets_USE_LIBS "${wxWidgets_USE_LIBS}")
|
||||||
EXEC_PROGRAM(${wxWidgets_CONFIG_EXECUTABLE}
|
EXEC_PROGRAM(sh
|
||||||
ARGS "--libs ${wxWidgets_USE_LIBS}"
|
ARGS "${wxWidgets_CONFIG_EXECUTABLE} --libs ${wxWidgets_USE_LIBS}"
|
||||||
OUTPUT_VARIABLE wxWidgets_LIBRARIES
|
OUTPUT_VARIABLE wxWidgets_LIBRARIES
|
||||||
RETURN_VALUE RET)
|
RETURN_VALUE RET)
|
||||||
IF(RET EQUAL 0)
|
IF(RET EQUAL 0)
|
||||||
|
|
Loading…
Reference in New Issue