procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove gtk-3 dep

This commit is contained in:
Berkus Decker 2017-11-24 15:58:51 +02:00
parent e2e836d9d2
commit 4c8084d42d
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -22,16 +22,12 @@ find_package(OpenAL REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
find_package(LibZip REQUIRED) find_package(LibZip REQUIRED)
find_package(LibLZMA REQUIRED) find_package(LibLZMA REQUIRED)
find_package(GTK3 3.0 REQUIRED gtk)
find_package(FFmpeg REQUIRED) find_package(FFmpeg REQUIRED)
find_package(Iconv REQUIRED) find_package(Iconv REQUIRED)
#@todo Turn into find_package(Opus REQUIRED) #@todo Turn into find_package(Opus REQUIRED)
find_library(OPUS_LIB opus) find_library(OPUS_LIB opus)
find_path(OPUS_INCLUDE_DIR opus.h PATHS /usr/local/include/opus) find_path(OPUS_INCLUDE_DIR opus.h PATHS /usr/local/include/opus)
# include_directories(${GTK3_INCLUDE_DIRS})
# link_directories(${GTK3_LIBRARY_DIRS})
if (NOT FFMPEG_SWSCALE_FOUND) if (NOT FFMPEG_SWSCALE_FOUND)
message(FATAL_ERROR "FFmpeg swscale is required") message(FATAL_ERROR "FFmpeg swscale is required")
endif() endif()

3
Telegram/CMakeLists.txt
View File

@ -547,11 +547,10 @@ include_directories(SourceFiles SourceFiles/core)
include_directories(${OPENAL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} include_directories(${OPENAL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS}
${LIBZIP_INCLUDE_DIR_ZIP} ${LIBZIP_INCLUDE_DIR_ZIPCONF} ${LIBZIP_INCLUDE_DIR_ZIP} ${LIBZIP_INCLUDE_DIR_ZIPCONF}
${OPENSSL_INCLUDE_DIR} ${LIBLZMA_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} ${LIBLZMA_INCLUDE_DIRS}
${ICONV_INCLUDE_DIR} ${OPUS_INCLUDE_DIR}) ${ICONV_INCLUDE_DIR} ${OPUS_INCLUDE_DIR})
# ${FFMPEG_INCLUDE_DIR}) -- this doesn't work, wtf? # ${FFMPEG_INCLUDE_DIR}) -- this doesn't work, wtf?
# link_directories(${GTK3_LIBRARY_DIRS})
# link_directories(${FFMPEG_LIBRARY_DIR}) # link_directories(${FFMPEG_LIBRARY_DIR})
add_subdirectory(ThirdParty/libtgvoip) add_subdirectory(ThirdParty/libtgvoip)