From a653fd0f44619dc4b182c5f450df002051ae5900 Mon Sep 17 00:00:00 2001 From: Berkus Decker Date: Mon, 20 Nov 2017 22:56:24 +0200 Subject: [PATCH] Private header temporary added. Qt and GTK requirements added. CMake required version reduced. --- CMakeLists.txt | 3 +++ Telegram/CMakeLists.txt | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 20362f9ba..3fe7c367a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,9 @@ find_package(OpenSSL REQUIRED) find_package(LibLZMA REQUIRED) find_package(GTK3 3.0 REQUIRED gtk) +include_directories(${GTK3_INCLUDE_DIRS}) +link_directories(${GTK3_LIBRARY_DIRS}) + #find_package(PortAudio REQUIRED) #find_package(Opus REQUIRED) #find_package(FFmpeg REQUIRED) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 31a5a9116..92a999f8e 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -1,10 +1,7 @@ -find_package(Qt5Core 5.6 REQUIRED) -find_package(Qt5Gui 5.6 REQUIRED) -find_package(Qt5Widgets 5.6 REQUIRED) +find_package(Qt5 5.6 COMPONENTS Core Gui Widgets REQUIRED) include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) - # defines if(CMAKE_SYSTEM_NAME STREQUAL "Linux") if (CMAKE_SIZEOF_VOID_P EQUAL 8)