# HG changeset patch # User Hasan Yavuz Ă–ZDERYA # Date 2016-12-31 14:47:27 # Node ID 1c96dc8ca6536a243284eb5fb90918b5c418fd8f # Parent 1399cc9872eb95b8552a4064c489b371d9239f1e remove dependency on svg and opengl modules of qt diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,7 +123,7 @@ add_executable(${PROGRAM_NAME} WIN32 # Use the Widgets module from Qt 5. target_link_libraries(${PROGRAM_NAME} ${QWT_LIBRARY}) -qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort Svg) +qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort) if (BUILD_QWT) add_dependencies(${PROGRAM_NAME} QWT) diff --git a/cmake/modules/BuildQwt.cmake b/cmake/modules/BuildQwt.cmake --- a/cmake/modules/BuildQwt.cmake +++ b/cmake/modules/BuildQwt.cmake @@ -25,6 +25,8 @@ ExternalProject_Add(QWT # disable QwtDesigner plugin and enable static build PATCH_COMMAND sed -i -r -e "s/QWT_CONFIG\\s*\\+=\\s*QwtDesigner/#&/" -e "s/QWT_CONFIG\\s*\\+=\\s*QwtDll/#&/" + -e "s/QWT_CONFIG\\s*\\+=\\s*QwtSvg/#&/" + -e "s/QWT_CONFIG\\s*\\+=\\s*QwtOpenGL/#&/" -e "s|QWT_INSTALL_PREFIX\\s*=.*|QWT_INSTALL_PREFIX = |" /qwtconfig.pri CONFIGURE_COMMAND qmake /qwt.pro