diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-10-25 13:26:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-25 18:11:51 +0200 |
| commit | 054f357b695cfb2ef4a3c20e2bb617f23a00172a (patch) | |
| tree | 34597deb3a3019ac67aab57d96ab1dcbd50bca97 | |
| parent | b01ec07a061f53776a0a178f7fe24f5321122f06 (diff) | |
CMake: Fix quoting issue with quoted paths in strings.
Create a local CMake variable instead and use that in the search
paths argument and in the message string.
Resolves a warning that can appear with CMake 2.8.12.
Task-number: QTBUG-34115
Change-Id: I04c67668586a9ad6584b7f6e91ee65351c86389c
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| -rw-r--r-- | src/gui/Qt5GuiConfigExtras.cmake.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in index 77e456df53..f2f75d0ea0 100644 --- a/src/gui/Qt5GuiConfigExtras.cmake.in +++ b/src/gui/Qt5GuiConfigExtras.cmake.in @@ -54,12 +54,14 @@ set(Qt5Gui_OPENGL_LIBRARIES Qt5::Gui_GLESv2) !!IF !isEmpty(CMAKE_GL_INCDIRS) +set(_GL_INCDIRS $$CMAKE_GL_INCDIRS) find_path(_qt5gui_OPENGL_INCLUDE_DIR $$CMAKE_GL_HEADER_NAME - PATHS $$CMAKE_GL_INCDIRS + PATHS ${_GL_INCDIRS} NO_DEFAULT_PATH) if (NOT _qt5gui_OPENGL_INCLUDE_DIR) - message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"$$CMAKE_GL_INCDIRS\\\".\") + message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") endif() +unset(_GL_INCDIRS) _qt5_Gui_check_file_exists(${_qt5gui_OPENGL_INCLUDE_DIR}) |