summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Becker <[email protected]>2017-04-28 17:17:12 +0200
committerPali Roh├ír <[email protected]>2017-12-22 09:10:30 +0100
commit373f55d6b822c7d64dc1ad6e3af0e0663880a1c8 (patch)
tree7d24dba1b78d1c263093d85738e3f184fd4a92e1
parent53631231dfb52969de4dcce2674d83bc0fd7aeca (diff)
cmake: Remove endif/else(FOO)
According to CMake Coding Style on https://community.kde.org/Policies/CMake_Coding_Style.
-rw-r--r--CMakeLists.txt10
-rw-r--r--plugins/CMakeLists.txt42
-rw-r--r--protocols/CMakeLists.txt56
3 files changed, 54 insertions, 54 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9999b80..b9af1d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,20 +50,20 @@ include_directories(${PHONON_INCLUDES})
if(WIN32)
set(CMAKE_REQUIRED_LIBRARIES ${KDEWIN32_LIBRARIES})
set(CMAKE_REQUIRED_INCLUDES ${KDEWIN32_INCLUDES})
-endif(WIN32)
+endif()
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
if(WIN32)
set(DISABLE_VIDEOSUPPORT ON)
-else (WIN32)
+else()
option(DISABLE_VIDEOSUPPORT "Build Kopete without video-support" OFF)
-endif(WIN32)
+endif()
if(DISABLE_VIDEOSUPPORT)
add_definitions(-DVIDEOSUPPORT_DISABLED)
-endif(DISABLE_VIDEOSUPPORT)
+endif()
set(LIBKLEO_LIB_VERSION_LIB "5.4.0")
find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION_LIB} CONFIG REQUIRED)
@@ -152,7 +152,7 @@ set_package_properties(ZLIB PROPERTIES DESCRIPTION "Zlib is a library implementi
if(Q_WS_X11)
macro_log_feature(X11_Xss_FOUND "libXss" "libXss provides access to screen server X11 extension" "" FALSE "" "Required for idle timer on X11")
-endif(Q_WS_X11)
+endif()
set(KOPETE_INCLUDES
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 982b1aa..6216058 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -20,60 +20,60 @@ option(WITH_cryptography "Enable Kopete Cryptography plugin" OFF) # To be re-wri
# Laurent this plugins use shell script which will not work on windows
if (WITH_latex AND UNIX)
add_subdirectory( latex )
-endif (WITH_latex AND UNIX)
+endif()
if (WITH_autoreplace)
add_subdirectory( autoreplace )
-endif (WITH_autoreplace)
+endif()
if (WITH_history)
add_subdirectory( history )
-endif (WITH_history)
+endif()
if (WITH_history2)
add_subdirectory( history2 )
-endif (WITH_history2)
+endif()
if (WITH_contactnotes)
add_subdirectory( contactnotes )
-endif (WITH_contactnotes)
+endif()
if (WITH_translator)
add_subdirectory( translator )
-endif (WITH_translator)
+endif()
if (WITH_nowlistening)
add_subdirectory( nowlistening )
-endif (WITH_nowlistening)
+endif()
if (WITH_texteffect)
add_subdirectory( texteffect )
-endif (WITH_texteffect)
+endif()
if (WITH_highlight)
add_subdirectory( highlight )
-endif (WITH_highlight)
+endif()
#Disabled since it doesn't do anything
#if (WITH_alias)
# add_subdirectory( alias )
-#endif (WITH_alias)
+#endif()
if (WITH_addbookmarks)
add_subdirectory( addbookmarks )
-endif (WITH_addbookmarks)
+endif()
if(NOT MSVC)
if (WITH_privacy)
add_subdirectory( privacy )
-endif (WITH_privacy)
-else(NOT MSVC)
+endif()
+else()
message(STATUS "disabled privacy plugin because some KGenericFactory<> template won't compile")
-endif(NOT MSVC)
+endif()
if (WITH_urlpicpreview)
add_subdirectory( urlpicpreview )
-endif (WITH_urlpicpreview)
+endif()
if (WITH_statistics AND SQLITE_FOUND)
add_subdirectory ( statistics )
-endif (WITH_statistics AND SQLITE_FOUND)
-if (WITH_pipes)
+endif()
+if(WITH_pipes)
add_subdirectory ( pipes )
-endif (WITH_pipes)
+endif()
if(WITH_webpresence AND LIBXML2_FOUND AND LIBXSLT_FOUND)
add_subdirectory( webpresence )
-endif(WITH_webpresence AND LIBXML2_FOUND AND LIBXSLT_FOUND)
+endif()
if (WITH_otr AND LIBOTR_FOUND)
add_subdirectory ( otr )
-endif (WITH_otr AND LIBOTR_FOUND)
+endif()
if (WITH_cryptography AND QGpgme_FOUND)
add_subdirectory ( cryptography )
-endif (WITH_cryptography AND QGpgme_FOUND)
+endif()
diff --git a/protocols/CMakeLists.txt b/protocols/CMakeLists.txt
index f461702..e863cf6 100644
--- a/protocols/CMakeLists.txt
+++ b/protocols/CMakeLists.txt
@@ -18,94 +18,94 @@ option(WITH_skype "Enable Kopete Skype protocol" ON)
#if(LIBORTP_FOUND AND SPEEX_FOUND AND ALSA_FOUND AND WITH_JINGLE)
# message(STATUS "Building jingle support")
# set(BUILD_JINGLE TRUE)
-#else(LIBORTP_FOUND AND SPEEX_FOUND AND ALSA_FOUND AND WITH_JINGLE)
+#else()
# message(STATUS "Not building jingle support (recommended)")
# set(BUILD_JINGLE FALSE)
-#endif(LIBORTP_FOUND AND SPEEX_FOUND AND ALSA_FOUND AND WITH_JINGLE)
+#endif()
set(BUILD_JINGLE FALSE)
if(OPENSSL_FOUND OR WIN32)
if(EXPAT_FOUND AND LIBORTP_FOUND AND SRTP_FOUND AND JSONCPP_FOUND AND MEDIASTREAMER_FOUND AND WITH_libjingle)
message(STATUS "Building jabber libjingle support")
set(BUILD_LIBJINGLE TRUE)
- else(EXPAT_FOUND AND LIBORTP_FOUND AND SRTP_FOUND AND JSONCPP_FOUND AND MEDIASTREAMER_FOUND AND WITH_libjingle)
+ else()
message(STATUS "Not building jabber libjingle support")
set(BUILD_LIBJINGLE FALSE)
- endif(EXPAT_FOUND AND LIBORTP_FOUND AND SRTP_FOUND AND JSONCPP_FOUND AND MEDIASTREAMER_FOUND AND WITH_libjingle)
-else(OPENSSL_FOUND OR WIN32)
+ endif()
+else()
message(STATUS "Not building jabber libjingle support")
set(BUILD_LIBJINGLE FALSE)
-endif(OPENSSL_FOUND OR WIN32)
+endif()
if(MEDIASTREAMER_FOUND AND LIBORTP_FOUND AND WITH_WLM_MEDIASTREAMER)
message(STATUS "Building Windows Live Messenger voice clip support")
set(BUILD_WLM_MEDIASTREAMER TRUE)
-else(MEDIASTREAMER_FOUND AND LIBORTP_FOUND AND WITH_WLM_MEDIASTREAMER)
+else()
message(STATUS "Not building Windows Live Messenger voice clip support")
set(BUILD_WLM_MEDIASTREAMER FALSE)
-endif(MEDIASTREAMER_FOUND AND LIBORTP_FOUND AND WITH_WLM_MEDIASTREAMER)
+endif()
include_directories(${KOPETE_INCLUDES})
if(WITH_wlm AND LIBMSN_FOUND AND Boost_FOUND)
add_subdirectory( wlm )
-endif(WITH_wlm AND LIBMSN_FOUND AND Boost_FOUND)
+endif()
if(WITH_oscar)
add_subdirectory( oscar )
-endif(WITH_oscar)
+endif()
if(WITH_yahoo AND JASPER_FOUND)
add_subdirectory( yahoo )
-endif(WITH_yahoo AND JASPER_FOUND)
+endif()
if(WITH_qq)
add_subdirectory( qq )
-endif(WITH_qq)
+endif()
if(NOT WIN32)
if(WITH_winpopup)
add_subdirectory( winpopup )
- endif(WITH_winpopup)
+ endif()
if(WITH_gadu AND LIBGADU_FOUND)
add_subdirectory( gadu )
- endif(WITH_gadu AND LIBGADU_FOUND)
+ endif()
message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: WARNING: sms plugin disabled")
# if(WITH_sms)
# add_subdirectory( sms )
-# endif(WITH_sms)
+# endif()
message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: WARNING: skype plugin disabled")
# if(NOT APPLE AND WITH_skype)
# add_subdirectory( skype )
-# endif(NOT APPLE AND WITH_skype)
-endif(NOT WIN32)
+# endif()
+endif()
if(Qca-qt5_FOUND AND ZLIB_FOUND)
if(IDN_FOUND AND QJSON_FOUND)
if(WITH_jabber)
add_subdirectory( jabber )
- endif(WITH_jabber)
- else(IDN_FOUND AND QJSON_FOUND)
+ endif()
+ else()
message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: Disabled Jabber because libidn-devel or qjson was not found")
- endif(IDN_FOUND AND QJSON_FOUND)
+ endif()
if(WITH_groupwise)
add_subdirectory( groupwise )
- endif(WITH_groupwise)
-else(Qca-qt5_FOUND AND ZLIB_FOUND)
+ endif()
+else()
message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: Disabled GroupWise and Jabber because QCA2 was not found")
-endif(Qca-qt5_FOUND AND ZLIB_FOUND)
+endif()
if(WITH_testbed)
add_subdirectory( testbed )
-endif(WITH_testbed)
+endif()
if(WITH_bonjour)
add_subdirectory( bonjour )
-endif(WITH_bonjour)
+endif()
if(WITH_meanwhile)
if(LIBMEANWHILE_FOUND)
add_subdirectory( meanwhile )
- else(LIBMEANWHILE_FOUND)
+ else()
message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: Disabled Meanwhile beause libmeanwhile was not found")
- endif(LIBMEANWHILE_FOUND)
-endif(WITH_meanwhile)
+ endif()
+endif()