[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kcm-grub2] src: Minor CMakeLists.txt cosmetic fixes.
From:       Konstantinos Smanis <konstantinos.smanis () gmail ! com>
Date:       2013-10-03 13:45:50
Message-ID: E1VRjDy-0002Sk-DT () scm ! kde ! org
[Download RAW message or body]

Git commit 93ca506c5bbe1a61f5ce1ad93316e26523135313 by Konstantinos Smanis.
Committed on 03/10/2013 at 13:42.
Pushed by ksmanis into branch 'master'.

Minor CMakeLists.txt cosmetic fixes.

Make use of elseif. Treat if/elseif/endif as functions and trim the
whitespace before each parenthesis.

M  +25   -31   src/CMakeLists.txt
M  +4    -4    src/helper/CMakeLists.txt

http://commits.kde.org/kcm-grub2/93ca506c5bbe1a61f5ce1ad93316e26523135313

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fbfbd45..2e46392 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,57 +2,51 @@ add_subdirectory(helper)
 =

 # Set Include Directories
 set(kcm_grub2_INCLUDE_DIRS ${KDE4_INCLUDES})
-if (HAVE_IMAGEMAGICK)
+if(HAVE_IMAGEMAGICK)
     set(kcm_grub2_INCLUDE_DIRS ${kcm_grub2_INCLUDE_DIRS} ${ImageMagick_INC=
LUDE_DIRS})
-endif (HAVE_IMAGEMAGICK)
-if (HAVE_QAPT)
+endif(HAVE_IMAGEMAGICK)
+if(HAVE_QAPT)
     set(kcm_grub2_INCLUDE_DIRS ${kcm_grub2_INCLUDE_DIRS} ${QAPT_INCLUDE_DI=
R})
-else (HAVE_QAPT)
-    if (HAVE_QPACKAGEKIT)
-        set(kcm_grub2_INCLUDE_DIRS ${kcm_grub2_INCLUDE_DIRS} ${QPACKAGEKIT=
_INCLUDE_DIR})
-    endif (HAVE_QPACKAGEKIT)
-endif (HAVE_QAPT)
+elseif(HAVE_QPACKAGEKIT)
+    set(kcm_grub2_INCLUDE_DIRS ${kcm_grub2_INCLUDE_DIRS} ${QPACKAGEKIT_INC=
LUDE_DIR})
+endif(HAVE_QAPT)
 =

 # Set Sources
 set(kcm_grub2_SRCS common.cpp entry.cpp installDlg.cpp kcm_grub2.cpp)
 kde4_add_ui_files(kcm_grub2_SRCS ../ui/installDlg.ui ../ui/kcm_grub2.ui)
-if (HAVE_IMAGEMAGICK)
+if(HAVE_IMAGEMAGICK)
     set(kcm_grub2_SRCS ${kcm_grub2_SRCS} convertDlg.cpp)
     kde4_add_ui_files(kcm_grub2_SRCS ../ui/convertDlg.ui)
-endif (HAVE_IMAGEMAGICK)
-if (HAVE_QAPT OR HAVE_QPACKAGEKIT)
+endif(HAVE_IMAGEMAGICK)
+if(HAVE_QAPT OR HAVE_QPACKAGEKIT)
     set(kcm_grub2_SRCS ${kcm_grub2_SRCS} removeDlg.cpp)
     kde4_add_ui_files(kcm_grub2_SRCS ../ui/removeDlg.ui)
-endif (HAVE_QAPT OR HAVE_QPACKAGEKIT)
-if (HAVE_QAPT)
-    if (QAPT_VERSION_MAJOR EQUAL 1)
+endif(HAVE_QAPT OR HAVE_QPACKAGEKIT)
+if(HAVE_QAPT)
+    if(QAPT_VERSION_MAJOR EQUAL 1)
         set(kcm_grub2_SRCS ${kcm_grub2_SRCS} qaptBackend.cpp)
-    elseif (QAPT_VERSION_MAJOR EQUAL 2)
+    elseif(QAPT_VERSION_MAJOR EQUAL 2)
         set(kcm_grub2_SRCS ${kcm_grub2_SRCS} qapt2Backend.cpp)
-    endif (QAPT_VERSION_MAJOR EQUAL 1)
-else (HAVE_QAPT)
-    if (HAVE_QPACKAGEKIT)
-        set(kcm_grub2_SRCS ${kcm_grub2_SRCS} qPkBackend.cpp)
-    endif (HAVE_QPACKAGEKIT)
-endif (HAVE_QAPT)
+    endif(QAPT_VERSION_MAJOR EQUAL 1)
+elseif(HAVE_QPACKAGEKIT)
+    set(kcm_grub2_SRCS ${kcm_grub2_SRCS} qPkBackend.cpp)
+endif(HAVE_QAPT)
 =

 # Set Link Libraries
 set(kcm_grub2_LINK_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_SOLID_L=
IBS})
-if (HAVE_IMAGEMAGICK)
+if(HAVE_IMAGEMAGICK)
     set(kcm_grub2_LINK_LIBS ${kcm_grub2_LINK_LIBS} ${ImageMagick_LIBRARIES=
})
-endif (HAVE_IMAGEMAGICK)
-if (HAVE_QAPT)
+endif(HAVE_IMAGEMAGICK)
+if(HAVE_QAPT)
     set(kcm_grub2_LINK_LIBS ${kcm_grub2_LINK_LIBS} ${QAPT_LIBRARY})
-else (HAVE_QAPT)
-    if (HAVE_QPACKAGEKIT)
-        set(kcm_grub2_LINK_LIBS ${kcm_grub2_LINK_LIBS} ${QPACKAGEKIT_LIB})
-    endif (HAVE_QPACKAGEKIT)
-endif (HAVE_QAPT)
+elseif(HAVE_QPACKAGEKIT)
+    set(kcm_grub2_LINK_LIBS ${kcm_grub2_LINK_LIBS} ${QPACKAGEKIT_LIB})
+endif(HAVE_QAPT)
 =

 # Definitions
-if (HAVE_IMAGEMAGICK)
+if(HAVE_IMAGEMAGICK)
     add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-endif (HAVE_IMAGEMAGICK)
+endif(HAVE_IMAGEMAGICK)
 =

 # Build & Link
 include_directories(${kcm_grub2_INCLUDE_DIRS})
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
index 0a8757c..6a8792b 100644
--- a/src/helper/CMakeLists.txt
+++ b/src/helper/CMakeLists.txt
@@ -1,17 +1,17 @@
 # Set Include Directories
 set(kcmgrub2helper_INCLUDE_DIRS ${KDE4_INCLUDES})
-if (HAVE_HD)
+if(HAVE_HD)
     set(kcmgrub2helper_INCLUDE_DIRS ${kcmgrub2helper_INCLUDE_DIRS} ${HD_IN=
CLUDE_DIR})
-endif (HAVE_HD)
+endif(HAVE_HD)
 =

 # Set Sources
 set(kcmgrub2helper_SRCS helper.cpp)
 =

 # Set Link Libraries
 set(kcmgrub2helper_LINK_LIBS ${KDE4_KDECORE_LIBS})
-if (HAVE_HD)
+if(HAVE_HD)
     set(kcmgrub2helper_LINK_LIBS ${kcmgrub2helper_LINK_LIBS} ${HD_LIBRARY})
-endif (HAVE_HD)
+endif(HAVE_HD)
 =

 # Build & Link
 include_directories(${kcmgrub2helper_INCLUDE_DIRS})
[prev in list] [next in list] [prev in thread] [next in thread]