From e62e68d8dad3e554fdd9a41cea6ecdf35cde3102 Mon Sep 17 00:00:00 2001 From: protomors Date: Wed, 8 Nov 2017 02:31:53 +0600 Subject: CMake: clean up library dependencies. --- protocols/IRCG/CMakeLists.txt | 1 + protocols/IcqOscarJ/CMakeLists.txt | 1 + protocols/JabberG/CMakeLists.txt | 2 +- protocols/MSN/CMakeLists.txt | 2 +- protocols/Steam/CMakeLists.txt | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) (limited to 'protocols') diff --git a/protocols/IRCG/CMakeLists.txt b/protocols/IRCG/CMakeLists.txt index a281099459..9f37dca7f3 100644 --- a/protocols/IRCG/CMakeLists.txt +++ b/protocols/IRCG/CMakeLists.txt @@ -1,4 +1,5 @@ file(GLOB SOURCES "src/*.h" "src/*.cpp" "res/*.rc") set(TARGET IRC) include(${CMAKE_SOURCE_DIR}/cmake/plugin.cmake) +target_link_libraries(${TARGET} ws2_32.lib) add_subdirectory(proto_irc) \ No newline at end of file diff --git a/protocols/IcqOscarJ/CMakeLists.txt b/protocols/IcqOscarJ/CMakeLists.txt index f5c241229b..c5feb2c951 100644 --- a/protocols/IcqOscarJ/CMakeLists.txt +++ b/protocols/IcqOscarJ/CMakeLists.txt @@ -1,5 +1,6 @@ file(GLOB SOURCES "src/*.h" "src/*.cpp" "res/*.rc") set(TARGET ICQ) include(${CMAKE_SOURCE_DIR}/cmake/plugin.cmake) +target_link_libraries(${TARGET} comctl32.lib ws2_32.lib) add_subdirectory(proto_icq) add_subdirectory(icq_xstatus) \ No newline at end of file diff --git a/protocols/JabberG/CMakeLists.txt b/protocols/JabberG/CMakeLists.txt index 257a4cd8ae..65f5bb3a66 100644 --- a/protocols/JabberG/CMakeLists.txt +++ b/protocols/JabberG/CMakeLists.txt @@ -2,6 +2,6 @@ file(GLOB SOURCES "src/*.h" "src/*.cpp" "res/*.rc") set(TARGET Jabber) include_directories(${CMAKE_SOURCE_DIR}/libs/libaxolotl/src) include(${CMAKE_SOURCE_DIR}/cmake/plugin.cmake) -target_link_libraries(${TARGET} Zlib libaxolotl libeay32.lib ssleay32.lib) +target_link_libraries(${TARGET} Zlib libaxolotl ${OPENSSL_LIBRARIES} comctl32.lib UxTheme.lib ws2_32.lib) add_subdirectory(jabber_xstatus) add_subdirectory(proto_jabber) \ No newline at end of file diff --git a/protocols/MSN/CMakeLists.txt b/protocols/MSN/CMakeLists.txt index a3984234ef..58e247810b 100644 --- a/protocols/MSN/CMakeLists.txt +++ b/protocols/MSN/CMakeLists.txt @@ -1,5 +1,5 @@ file(GLOB SOURCES "src/*.h" "src/skylogin/*.h" "src/*.cpp" "src/*.c" "src/skylogin/*.c" "res/*.rc") set(TARGET MSN) include(${CMAKE_SOURCE_DIR}/cmake/plugin.cmake) -target_link_libraries(${TARGET} libeay32.lib) +target_link_libraries(${TARGET} libjson ${OPENSSL_LIBRARIES} comctl32.lib) add_subdirectory(proto_msn) \ No newline at end of file diff --git a/protocols/Steam/CMakeLists.txt b/protocols/Steam/CMakeLists.txt index 4f76cb5bf9..9dacd1a586 100644 --- a/protocols/Steam/CMakeLists.txt +++ b/protocols/Steam/CMakeLists.txt @@ -1,4 +1,5 @@ file(GLOB SOURCES "src/*.h" "src/api/*.h" "src/*.cpp" "res/*.rc") set(TARGET Steam) include(${CMAKE_SOURCE_DIR}/cmake/plugin.cmake) +target_link_libraries(${TARGET} libjson comctl32.lib) add_subdirectory(proto_steam) \ No newline at end of file -- cgit v1.2.3 From 9d493cceb8ba9dfe38c2beaacdb6b79487818d35 Mon Sep 17 00:00:00 2001 From: protomors Date: Wed, 29 Nov 2017 14:52:36 +0300 Subject: CMake: removed deprecated protocols. --- protocols/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'protocols') diff --git a/protocols/CMakeLists.txt b/protocols/CMakeLists.txt index e3c6bfff44..dc3e63f9c1 100644 --- a/protocols/CMakeLists.txt +++ b/protocols/CMakeLists.txt @@ -16,9 +16,7 @@ add_subdirectory(MSN) add_subdirectory(SkypeWeb) #add_subdirectory(Slack) add_subdirectory(Steam) -#add_subdirectory(Telegram) #add_subdirectory(Tlen) #add_subdirectory(Tox) add_subdirectory(Twitter) -add_subdirectory(VKontakte) -#add_subdirectory(WhatsApp) \ No newline at end of file +add_subdirectory(VKontakte) \ No newline at end of file -- cgit v1.2.3 From b1103b6eb24f654e2e2666b0c86a6206920fd23a Mon Sep 17 00:00:00 2001 From: protomors Date: Wed, 29 Nov 2017 16:50:55 +0300 Subject: CMake: also removed Slack. --- protocols/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'protocols') diff --git a/protocols/CMakeLists.txt b/protocols/CMakeLists.txt index dc3e63f9c1..d9360f7a01 100644 --- a/protocols/CMakeLists.txt +++ b/protocols/CMakeLists.txt @@ -14,7 +14,6 @@ add_subdirectory(MSN) #add_subdirectory(Omegle) #add_subdirectory(Sametime) add_subdirectory(SkypeWeb) -#add_subdirectory(Slack) add_subdirectory(Steam) #add_subdirectory(Tlen) #add_subdirectory(Tox) -- cgit v1.2.3