32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
|
From e6fa6e60f6330ddf60294a0d9a6ed4cb3f27d4c4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Richard M. Shaw" <hobbes1069@gmail.com>
|
||
|
|
Date: Fri, 22 Aug 2014 10:27:48 -0500
|
||
|
|
Subject: [PATCH] UsewxWidgets: CFLAGS are expected to be a string here, not a
|
||
|
|
list.
|
||
|
|
|
||
|
|
---
|
||
|
|
Modules/UsewxWidgets.cmake | 7 +++++--
|
||
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Modules/UsewxWidgets.cmake b/Modules/UsewxWidgets.cmake
|
||
|
|
index f2f260d..b3633a6 100644
|
||
|
|
--- a/Modules/UsewxWidgets.cmake
|
||
|
|
+++ b/Modules/UsewxWidgets.cmake
|
||
|
|
@@ -88,8 +88,11 @@ if (wxWidgets_FOUND)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if (wxWidgets_CXX_FLAGS)
|
||
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}")
|
||
|
|
- MSG("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
|
||
|
|
+ # Flags are expected to be a string here, not a list.
|
||
|
|
+ string(REPLACE ";" " " wxWidgets_CXX_FLAGS_str "${wxWidgets_CXX_FLAGS}")
|
||
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS_str}")
|
||
|
|
+ MSG("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS_str}")
|
||
|
|
+ unset(wxWidgets_CXX_FLAGS_str)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
# DEPRECATED JW
|
||
|
|
--
|
||
|
|
1.7.10.4
|
||
|
|
|