[cmake-commits] king committed FindwxWidgets.cmake 1.3 1.4
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Sep 13 11:22:30 EDT 2006
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv27299
Modified Files:
FindwxWidgets.cmake
Log Message:
BUG: Patch from Peter Visser to run wx-config from an MSYS prompt.
Index: FindwxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindwxWidgets.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FindwxWidgets.cmake 21 Jul 2006 19:43:17 -0000 1.3
+++ FindwxWidgets.cmake 13 Sep 2006 15:22:27 -0000 1.4
@@ -539,8 +539,8 @@
SET(wxWidgets_FOUND TRUE)
# run the wx-config program to get cxxflags
- EXEC_PROGRAM(${wxWidgets_CONFIG_EXECUTABLE}
- ARGS "--cxxflags"
+ EXEC_PROGRAM(sh
+ ARGS "${wxWidgets_CONFIG_EXECUTABLE} --cxxflags"
OUTPUT_VARIABLE wxWidgets_CXX_FLAGS
RETURN_VALUE RET)
IF(RET EQUAL 0)
@@ -583,8 +583,8 @@
# be useful here...
#STRING(REPLACE ";" "," wxWidgets_USE_LIBS "${wxWidgets_USE_LIBS}")
STRING(REGEX REPLACE ";" "," wxWidgets_USE_LIBS "${wxWidgets_USE_LIBS}")
- EXEC_PROGRAM(${wxWidgets_CONFIG_EXECUTABLE}
- ARGS "--libs ${wxWidgets_USE_LIBS}"
+ EXEC_PROGRAM(sh
+ ARGS "${wxWidgets_CONFIG_EXECUTABLE} --libs ${wxWidgets_USE_LIBS}"
OUTPUT_VARIABLE wxWidgets_LIBRARIES
RETURN_VALUE RET)
IF(RET EQUAL 0)
More information about the Cmake-commits
mailing list