|
 |
875e72b |
diff -up cppcheck-1.83/cmake/findDependencies.cmake.qt5cmake cppcheck-1.83/cmake/findDependencies.cmake
|
|
|
875e72b |
--- cppcheck-1.83/cmake/findDependencies.cmake.qt5cmake 2018-04-02 09:02:50.000000000 +0200
|
|
|
875e72b |
+++ cppcheck-1.83/cmake/findDependencies.cmake 2018-06-02 16:50:28.656036644 +0200
|
|
|
875e72b |
@@ -1,6 +1,8 @@
|
|
|
875e72b |
if (BUILD_GUI)
|
|
|
875e72b |
- set(GUI_QT_COMPONENTS Core Gui Widgets PrintSupport)
|
|
|
875e72b |
- find_package(Qt5 COMPONENTS ${GUI_QT_COMPONENTS})
|
|
|
875e72b |
+ find_package(Qt5Core)
|
|
|
875e72b |
+ find_package(Qt5Gui)
|
|
|
875e72b |
+ find_package(Qt5Widgets)
|
|
|
875e72b |
+ find_package(Qt5PrintSupport)
|
|
|
875e72b |
find_package(Qt5LinguistTools)
|
|
|
875e72b |
endif()
|
|
|
875e72b |
|
|
|
20c4501 |
diff -up cppcheck-1.83/CMakeLists.txt.qt5cmake cppcheck-1.83/CMakeLists.txt
|
|
|
a125c9d |
--- cppcheck-1.83/CMakeLists.txt.qt5cmake 2018-06-02 16:47:11.038242820 +0200
|
|
|
a125c9d |
+++ cppcheck-1.83/CMakeLists.txt 2018-06-02 16:47:11.070242301 +0200
|
|
|
20c4501 |
@@ -1,5 +1,5 @@
|
|
|
20c4501 |
project(CppCheck)
|
|
|
20c4501 |
-cmake_minimum_required(VERSION 2.8.4)
|
|
|
20c4501 |
+cmake_minimum_required(VERSION 2.8.11)
|
|
|
20c4501 |
|
|
|
20c4501 |
include(GNUInstallDirs)
|
|
|
20c4501 |
|
|
|
20c4501 |
diff -up cppcheck-1.83/gui/CMakeLists.txt.qt5cmake cppcheck-1.83/gui/CMakeLists.txt
|
|
|
a125c9d |
--- cppcheck-1.83/gui/CMakeLists.txt.qt5cmake 2018-06-02 16:47:11.049242641 +0200
|
|
|
a125c9d |
+++ cppcheck-1.83/gui/CMakeLists.txt 2018-06-02 16:47:24.622022436 +0200
|
|
|
20c4501 |
@@ -24,8 +24,8 @@ if (BUILD_GUI)
|
|
|
20c4501 |
target_link_libraries(cppcheck-gui pcre)
|
|
|
20c4501 |
endif()
|
|
|
20c4501 |
target_link_libraries(cppcheck-gui tinyxml2)
|
|
|
20c4501 |
- qt5_use_modules(cppcheck-gui ${GUI_QT_COMPONENTS})
|
|
|
20c4501 |
-
|
|
|
a125c9d |
+ target_link_libraries(cppcheck-gui Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport)
|
|
|
20c4501 |
+
|
|
|
20c4501 |
install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
|
|
|
20c4501 |
install(FILES ${qms} DESTINATION share/${PROJECT_NAME}/lang/ COMPONENT applications)
|
|
|
20c4501 |
|