Skip to content

Commit

Permalink
Some minor cleaning up (#1342).
Browse files Browse the repository at this point in the history
  • Loading branch information
agarny committed Jun 24, 2017
1 parent 99f2a51 commit 9aa6502
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -1316,7 +1316,7 @@ ELSE()
IF("${QT_LIBRARY}" STREQUAL "${CHARTS}")
SET(REAL_QT_LIBRARY_DIR ${QTCHARTS_LIBRARIES_DIR})
ELSEIF( "${QT_LIBRARY}" STREQUAL "${WEBKIT}"
OR "${QT_LIBRARY}" STREQUAL "${WEBKITWIDGETS}")
OR "${QT_LIBRARY}" STREQUAL "${WEBKITWIDGETS}")
SET(REAL_QT_LIBRARY_DIR ${QTWEBKIT_LIBRARIES_DIR})
ELSE()
SET(REAL_QT_LIBRARY_DIR ${QT_LIBRARY_DIR})
Expand Down
10 changes: 5 additions & 5 deletions cmake/common.cmake
Expand Up @@ -548,10 +548,10 @@ MACRO(WINDOWS_DEPLOY_QT_LIBRARY LIBRARY_NAME)
IF( "${LIBRARY_NAME}" STREQUAL "Qt5Charts")
SET(REAL_QT_BINARY_DIR ${QTCHARTS_BINARIES_DIR})
ELSEIF( "${LIBRARY_NAME}" STREQUAL "Qt5WebKit"
OR "${LIBRARY_NAME}" STREQUAL "Qt5WebKitWidgets"
OR "${LIBRARY_NAME}" STREQUAL "icudt${ICU_VERSION}"
OR "${LIBRARY_NAME}" STREQUAL "icuin${ICU_VERSION}"
OR "${LIBRARY_NAME}" STREQUAL "icuuc${ICU_VERSION}")
OR "${LIBRARY_NAME}" STREQUAL "Qt5WebKitWidgets"
OR "${LIBRARY_NAME}" STREQUAL "icudt${ICU_VERSION}"
OR "${LIBRARY_NAME}" STREQUAL "icuin${ICU_VERSION}"
OR "${LIBRARY_NAME}" STREQUAL "icuuc${ICU_VERSION}")
SET(REAL_QT_BINARY_DIR ${QTWEBKIT_BINARIES_DIR})
ELSE()
SET(REAL_QT_BINARY_DIR ${QT_BINARY_DIR})
Expand Down Expand Up @@ -756,7 +756,7 @@ MACRO(MACOS_DEPLOY_QT_LIBRARY LIBRARY_NAME)
IF("${LIBRARY_NAME}" STREQUAL "${QTCHARTS}")
SET(REAL_QT_LIBRARY_DIR ${QTCHARTS_LIBRARIES_DIR})
ELSEIF( "${LIBRARY_NAME}" STREQUAL "${QTWEBKIT}"
OR "${LIBRARY_NAME}" STREQUAL "${QTWEBKITWIDGETS}")
OR "${LIBRARY_NAME}" STREQUAL "${QTWEBKITWIDGETS}")
SET(REAL_QT_LIBRARY_DIR ${QTWEBKIT_LIBRARIES_DIR})
ELSE()
SET(REAL_QT_LIBRARY_DIR ${QT_LIBRARY_DIR})
Expand Down

0 comments on commit 9aa6502

Please sign in to comment.