Merge lp:~davidgomes/noise/cmakelists-fixes into lp:~elementary-apps/noise/trunk

[David Gomes]

CMakeLists.txt: Code style fixes and removed check for CXX compiler.

General code style fixes and removed check for g++.

[lp:~davidgomes/noise/cmakelists-fixes]

1532. By David Gomes on 2013-09-16

More code style fixes.

1533. By David Gomes on 2013-09-16

More and more fixes to CMake style.

1534. By David Gomes on 2013-09-16

Yet more fixes.

[Cody Garver (codygarver)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-08-17 06:52:05 +0000
+++ CMakeLists.txt	2013-09-16 07:14:02 +0000
@@ -1,21 +1,21 @@
 # check http://elementaryos.org/docs/developer-guide/cmake/simple-project
 
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(VERSION 2.6)
-project(noise)
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-
-set(GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
-set(RELEASE_NAME "Luna")
-set(VERSION "0.2.4")
-set(VERSION_INFO "Stable Release")
-
-set(DATADIR ${CMAKE_INSTALL_PREFIX}/share)
-set(PKG_DATADIR ${DATADIR}/${CMAKE_PROJECT_NAME})
-set(ICON_DIR ${DATADIR}/${CMAKE_PROJECT_NAME}/icons)
-set(PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_PROJECT_NAME}/plugins)
-
-add_definitions("-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"")
+cmake_minimum_required (VERSION 2.6)
+cmake_policy (VERSION 2.6)
+project (noise C)
+list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+
+set (GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
+set (RELEASE_NAME "Luna")
+set (VERSION "0.2.4")
+set (VERSION_INFO "Stable Release")
+
+set (DATADIR ${CMAKE_INSTALL_PREFIX}/share)
+set (PKG_DATADIR ${DATADIR}/${CMAKE_PROJECT_NAME})
+set (ICON_DIR ${DATADIR}/${CMAKE_PROJECT_NAME}/icons)
+set (PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_PROJECT_NAME}/plugins)
+
+add_definitions ("-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"")
 
 # Add 'make dist' command for creating release tarball
 set (CPACK_PACKAGE_VERSION ${VERSION})
@@ -26,19 +26,19 @@
 include (CPack)
 add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 
-option(BUILD_SHARED_LIBS "Switch between shared and static libraries" ON)
+option (BUILD_SHARED_LIBS "Switch between shared and static libraries" ON)
 
 if (BUILD_SHARED_LIBS)
-    message("-- Shared libraries enabled")
+  message ("-- Shared libraries enabled")
 else ()
-    message("-- Shared libraries disabled")
+  message ("-- Shared libraries disabled")
 endif ()
 
-set(SRC_TARGET ${CMAKE_PROJECT_NAME})
-set(CORE_LIBRARY_NAME ${SRC_TARGET}-core)
+set (SRC_TARGET ${CMAKE_PROJECT_NAME})
+set (CORE_LIBRARY_NAME ${SRC_TARGET}-core)
 
 if (NOT BUILD_SHARED_LIBS)
-    set(CORE_LIBRARY_NAME ${CORE_LIBRARY_NAME}-static)
+  set (CORE_LIBRARY_NAME ${CORE_LIBRARY_NAME}-static)
 endif ()
 
 #
@@ -50,110 +50,110 @@
 # *_PKG would use the name of the package known by pkg-config.
 #
 
-set(CORE_PACKAGES
-    glib-2.0
-    gio-2.0
-    gee-1.0
-    libpeas-1.0
-    libpeas-gtk-1.0
-    gtk+-3.0
-    granite
-    gstreamer-0.10
-    gstreamer-interfaces-0.10
-    gstreamer-pbutils-0.10
-    gstreamer-tag-0.10
-)
-
-set(CORE_PKG
-    glib-2.0>=2.32
-    gio-2.0
-    gee-1.0
-    libpeas-1.0
-    libpeas-gtk-1.0
-    gtk+-3.0>=3.4.2
-    granite
-    gstreamer-0.10
-    gstreamer-interfaces-0.10
-    gstreamer-tag-0.10
-    gstreamer-pbutils-0.10
-)
-
-set(DEPS_PACKAGES
-    ${CORE_LIBRARY_NAME}
-    ${CORE_PACKAGES} # this is needed until we provide a ${CORE_LIBRARY_NAME}.deps file
-    taglib_c
-)
-
-set(DEPS_PKG
-    taglib_c
-)
-
-find_package(PkgConfig)
-
-pkg_check_modules(CORE_DEPS REQUIRED ${CORE_PKG})
-pkg_check_modules(DEPS REQUIRED ${DEPS_PKG} ${CORE_PKG})
-
-set(GLOBAL_VALAC_OPTIONS
-    --vapidir=${CMAKE_SOURCE_DIR}/vapi
-    --vapidir=${CMAKE_BINARY_DIR}/core
-    --vapidir=${CMAKE_BINARY_DIR}/src
-    --target-glib=2.32
-    --thread
+set (CORE_PACKAGES
+  glib-2.0
+  gio-2.0
+  gee-1.0
+  libpeas-1.0
+  libpeas-gtk-1.0
+  gtk+-3.0
+  granite
+  gstreamer-0.10
+  gstreamer-interfaces-0.10
+  gstreamer-pbutils-0.10
+  gstreamer-tag-0.10
+)
+
+set (CORE_PKG
+  glib-2.0>=2.32
+  gio-2.0
+  gee-1.0
+  libpeas-1.0
+  libpeas-gtk-1.0
+  gtk+-3.0>=3.4.2
+  granite
+  gstreamer-0.10
+  gstreamer-interfaces-0.10
+  gstreamer-tag-0.10
+  gstreamer-pbutils-0.10
+)
+
+set (DEPS_PACKAGES
+  ${CORE_LIBRARY_NAME}
+  ${CORE_PACKAGES} # this is needed until we provide a ${CORE_LIBRARY_NAME}.deps file
+  taglib_c
+)
+
+set (DEPS_PKG
+  taglib_c
+)
+
+find_package (PkgConfig)
+
+pkg_check_modules (CORE_DEPS REQUIRED ${CORE_PKG})
+pkg_check_modules (DEPS REQUIRED ${DEPS_PKG} ${CORE_PKG})
+
+set (GLOBAL_VALAC_OPTIONS
+  --vapidir=${CMAKE_SOURCE_DIR}/vapi
+  --vapidir=${CMAKE_BINARY_DIR}/core
+  --vapidir=${CMAKE_BINARY_DIR}/src
+  --target-glib=2.32
+  --thread
 )
 
 #
 # SQLHeavy: Use version 0.2 if it is available; otherwise, fall back to 0.1
 #
-pkg_check_modules(SQLHEAVY2 QUIET sqlheavy-0.2)
+pkg_check_modules (SQLHEAVY2 QUIET sqlheavy-0.2)
 if (SQLHEAVY2_FOUND)
-    message("-- Will use sqlheavy-0.2")
-    set(DEPS_PACKAGES ${DEPS_PACKAGES} sqlheavy-0.2)
-    set(SQLHEAVY_CFLAGS ${SQLHEAVY2_CFLAGS})
-    set(SQLHEAVY_LIBRARY_DIRS ${SQLHEAVY2_LIBRARY_DIRS})
-    set(SQLHEAVY_LIBRARIES ${SQLHEAVY2_LIBRARIES})
+  message ("-- Will use sqlheavy-0.2")
+  set (DEPS_PACKAGES ${DEPS_PACKAGES} sqlheavy-0.2)
+  set (SQLHEAVY_CFLAGS ${SQLHEAVY2_CFLAGS})
+  set (SQLHEAVY_LIBRARY_DIRS ${SQLHEAVY2_LIBRARY_DIRS})
+  set (SQLHEAVY_LIBRARIES ${SQLHEAVY2_LIBRARIES})
 else ()
-    message("-- Will use sqlheavy-0.1")
-    pkg_check_modules(SQLHEAVY REQUIRED sqlheavy-0.1)
-    set(DEPS_PACKAGES ${DEPS_PACKAGES} sqlheavy-0.1)
+  message ("-- Will use sqlheavy-0.1")
+  pkg_check_modules (SQLHEAVY REQUIRED sqlheavy-0.1)
+  set (DEPS_PACKAGES ${DEPS_PACKAGES} sqlheavy-0.1)
 endif ()
 
-set(DEPS_CFLAGS ${DEPS_CFLAGS} ${SQLHEAVY_CFLAGS})
-set(DEPS_LIBRARIES ${DEPS_LIBRARIES} ${SQLHEAVY_LIBRARIES})
-set(DEPS_LIBRARY_DIRS ${DEPS_LIBRARY_DIRS} ${SQLHEAVY_LIBRARY_DIRS})
+set (DEPS_CFLAGS ${DEPS_CFLAGS} ${SQLHEAVY_CFLAGS})
+set (DEPS_LIBRARIES ${DEPS_LIBRARIES} ${SQLHEAVY_LIBRARIES})
+set (DEPS_LIBRARY_DIRS ${DEPS_LIBRARY_DIRS} ${SQLHEAVY_LIBRARY_DIRS})
 
 #
 # Libnotify
 #
-pkg_check_modules(LIBNOTIFY QUIET libnotify)
+pkg_check_modules (LIBNOTIFY QUIET libnotify)
 if (LIBNOTIFY_FOUND)
-    message("-- libnotify enabled")
-
-    set(GLOBAL_VALAC_OPTIONS ${GLOBAL_VALAC_OPTIONS} --define=HAVE_LIBNOTIFY)
-
-    set(DEPS_PACKAGES ${DEPS_PACKAGES} libnotify)
-
-    set(DEPS_CFLAGS ${DEPS_CFLAGS} ${LIBNOTIFY_CFLAGS})
-    set(DEPS_LIBRARIES ${DEPS_LIBRARIES} ${LIBNOTIFY_LIBRARIES})
-    set(DEPS_LIBRARY_DIRS ${DEPS_LIBRARY_DIRS} ${LIBNOTIFY_LIBRARY_DIRS})
+  message ("-- libnotify enabled")
+
+  set (GLOBAL_VALAC_OPTIONS ${GLOBAL_VALAC_OPTIONS} --define=HAVE_LIBNOTIFY)
+
+  set (DEPS_PACKAGES ${DEPS_PACKAGES} libnotify)
+
+  set (DEPS_CFLAGS ${DEPS_CFLAGS} ${LIBNOTIFY_CFLAGS})
+  set (DEPS_LIBRARIES ${DEPS_LIBRARIES} ${LIBNOTIFY_LIBRARIES})
+  set (DEPS_LIBRARY_DIRS ${DEPS_LIBRARY_DIRS} ${LIBNOTIFY_LIBRARY_DIRS})
 else ()
-    message("-- libnotify disabled")
+  message ("-- libnotify disabled")
 endif ()
 
-find_package(Vala REQUIRED)
-include(ValaVersion)
-ensure_vala_version("0.18.0" MINIMUM)
-include(ValaPrecompile)
+find_package (Vala REQUIRED)
+include (ValaVersion)
+ensure_vala_version ("0.18.0" MINIMUM)
+include (ValaPrecompile)
 
 set (DEPS_LIBRARIES ${DEPS_LIBRARIES} -lm)
-add_subdirectory(schemas)
-add_subdirectory(core)
+add_subdirectory (schemas)
+add_subdirectory (core)
 
 # 'src' and 'plugins' depend on the core library
-include_directories(${CMAKE_BINARY_DIR}/core)
-set(DEPS_LIBRARIES ${DEPS_LIBRARIES} ${CORE_LIBRARY_NAME})
+include_directories (${CMAKE_BINARY_DIR}/core)
+set (DEPS_LIBRARIES ${DEPS_LIBRARIES} ${CORE_LIBRARY_NAME})
 
-add_subdirectory(src)
-add_subdirectory(plugins)
-add_subdirectory(po)
-add_subdirectory(data)
-add_subdirectory(images)
+add_subdirectory (src)
+add_subdirectory (plugins)
+add_subdirectory (po)
+add_subdirectory (data)
+add_subdirectory (images)

=== modified file 'core/CMakeLists.txt'
--- core/CMakeLists.txt	2013-06-12 18:04:28 +0000
+++ core/CMakeLists.txt	2013-09-16 07:14:02 +0000
@@ -1,98 +1,97 @@
-set(CORE_LIB_VERSION 0.1)
-set(CORE_LIB_SOVERSION 0)
+set (CORE_LIB_VERSION 0.1)
+set (CORE_LIB_SOVERSION 0)
 
 ######################
 # lib PC file
 ######################
-set(CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/config.vala)
-set(PREFIX ${CMAKE_INSTALL_PREFIX})
-set(DOLLAR "$") # You hear that? It's kittens being killed by the gods of cmake
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.vala.cmake ${CONFIG_FILE})
-configure_file(${CMAKE_SOURCE_DIR}/core/${CORE_LIBRARY_NAME}.pc.cmake ${CMAKE_BINARY_DIR}/core/${CORE_LIBRARY_NAME}.pc)
-
-message(${CONFIG_FILE})
-
-set(CORE_SOURCE
-    ${CONFIG_FILE}
-    PluginManager.vala
-    Settings.vala
-    EqualizerPreset.vala
-    Player.vala
-    LibraryWindowInterface.vala
-    Library.vala
-    LibrariesManager.vala
-    NotificationManager.vala
-    Media.vala
-    Album.vala
-    Devices/Device.vala
-    Devices/NetworkDevice.vala
-    Devices/DeviceManager.vala
-    Devices/DevicePreferences.vala
-    Playlists/Playlist.vala
-    Playlists/StaticPlaylist.vala
-    Playlists/SmartPlaylist.vala
-    Playlists/SmartQuery.vala
-    Utils/FileUtils.vala
-    Utils/TimeUtils.vala
-    Utils/String.vala
-    Utils/Numeric.vala
-    Utils/UI.vala
-    Utils/CompareFunctionHolder.vala
-    Utils/Utils.vala
-    Utils/PlaylistsUtils.vala
-    Utils/Threads.vala
-    Utils/Icon.vala
-    Utils/Icons.vala
-    Utils/Search.vala
-    Utils/PixbufUtils.vala
-    Utils/PixbufCache.vala
-    GStreamer/Pipeline.vala
-    GStreamer/Equalizer.vala
-    GStreamer/Playback.vala
-    Widgets/SettingsWidgets.vala
-    main.vala
+set (CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/config.vala)
+set (PREFIX ${CMAKE_INSTALL_PREFIX})
+set (DOLLAR "$") # You hear that? It's kittens being killed by the gods of cmake
+
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.vala.cmake ${CONFIG_FILE})
+configure_file (${CMAKE_SOURCE_DIR}/core/${CORE_LIBRARY_NAME}.pc.cmake ${CMAKE_BINARY_DIR}/core/${CORE_LIBRARY_NAME}.pc)
+
+message (${CONFIG_FILE})
+
+set (CORE_SOURCE
+  ${CONFIG_FILE}
+  PluginManager.vala
+  Settings.vala
+  EqualizerPreset.vala
+  Player.vala
+  LibraryWindowInterface.vala
+  Library.vala
+  LibrariesManager.vala
+  NotificationManager.vala
+  Media.vala
+  Album.vala
+  Devices/Device.vala
+  Devices/NetworkDevice.vala
+  Devices/DeviceManager.vala
+  Devices/DevicePreferences.vala
+  Playlists/Playlist.vala
+  Playlists/StaticPlaylist.vala
+  Playlists/SmartPlaylist.vala
+  Playlists/SmartQuery.vala
+  Utils/FileUtils.vala
+  Utils/TimeUtils.vala
+  Utils/String.vala
+  Utils/Numeric.vala
+  Utils/UI.vala
+  Utils/CompareFunctionHolder.vala
+  Utils/Utils.vala
+  Utils/PlaylistsUtils.vala
+  Utils/Threads.vala
+  Utils/Icon.vala
+  Utils/Icons.vala
+  Utils/Search.vala
+  Utils/PixbufUtils.vala
+  Utils/PixbufCache.vala
+  GStreamer/Pipeline.vala
+  GStreamer/Equalizer.vala
+  GStreamer/Playback.vala
+  Widgets/SettingsWidgets.vala
+  main.vala
 )
 
-if (BUILD_SHARED_LIBS)
-    set(LINK_MODE SHARED)
+if  (BUILD_SHARED_LIBS)
+  set (LINK_MODE SHARED)
 else ()
-    set(LINK_MODE STATIC)
+  set (LINK_MODE STATIC)
 endif ()
 
-set(CORE_VALAC_OPTIONS ${GLOBAL_VALAC_OPTIONS})
-
-vala_precompile(CORE_VALA_C ${CORE_LIBRARY_NAME}
-    ${CORE_SOURCE}
-PACKAGES
-    ${CORE_PACKAGES}
-OPTIONS
-    ${CORE_VALAC_OPTIONS}
-GENERATE_VAPI
-    ${CORE_LIBRARY_NAME}
-GENERATE_HEADER
-    ${CORE_LIBRARY_NAME}
-)
-
-add_definitions(${CORE_DEPS_CFLAGS})
-link_directories(${CORE_DEPS_LIBRARY_DIRS})
-
-add_library(${CORE_LIBRARY_NAME} ${LINK_MODE} ${CORE_VALA_C})
-
-set_target_properties(${CORE_LIBRARY_NAME} PROPERTIES
-    OUTPUT_NAME ${CORE_LIBRARY_NAME}
-    VERSION ${CORE_LIB_VERSION}
-    SOVERSION ${CORE_LIB_SOVERSION}
-)
-
-target_link_libraries(${CORE_LIBRARY_NAME} ${CORE_DEPS_LIBRARIES})
+set (CORE_VALAC_OPTIONS ${GLOBAL_VALAC_OPTIONS})
+
+vala_precompile (CORE_VALA_C ${CORE_LIBRARY_NAME}
+  ${CORE_SOURCE}
+  PACKAGES
+  ${CORE_PACKAGES}
+  OPTIONS
+  ${CORE_VALAC_OPTIONS}
+  GENERATE_VAPI
+  ${CORE_LIBRARY_NAME}
+  GENERATE_HEADER
+  ${CORE_LIBRARY_NAME}
+)
+
+add_definitions (${CORE_DEPS_CFLAGS})
+link_directories (${CORE_DEPS_LIBRARY_DIRS})
+
+add_library (${CORE_LIBRARY_NAME} ${LINK_MODE} ${CORE_VALA_C})
+
+set_target_properties (${CORE_LIBRARY_NAME} PROPERTIES
+  OUTPUT_NAME ${CORE_LIBRARY_NAME}
+  VERSION ${CORE_LIB_VERSION}
+  SOVERSION ${CORE_LIB_SOVERSION}
+)
+
+target_link_libraries (${CORE_LIBRARY_NAME} ${CORE_DEPS_LIBRARIES})
 
 if (BUILD_SHARED_LIBS)
-    install(TARGETS ${CORE_LIBRARY_NAME} DESTINATION lib)
-    # Install lib stuffs
-    install (FILES ${CMAKE_BINARY_DIR}/core/${CORE_LIBRARY_NAME}.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/)
-    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_LIBRARY_NAME}.vapi DESTINATION share/vala/vapi/)
-    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CORE_LIBRARY_NAME}.deps DESTINATION share/vala/vapi/)
-    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_LIBRARY_NAME}.h DESTINATION include/${CORE_LIBRARY_NAME}/)
+  install (TARGETS ${CORE_LIBRARY_NAME} DESTINATION lib)
+  # Install lib stuffs
+  install (FILES ${CMAKE_BINARY_DIR}/core/${CORE_LIBRARY_NAME}.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/)
+  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_LIBRARY_NAME}.vapi DESTINATION share/vala/vapi/)
+  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CORE_LIBRARY_NAME}.deps DESTINATION share/vala/vapi/)
+  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_LIBRARY_NAME}.h DESTINATION include/${CORE_LIBRARY_NAME}/)
 endif ()
-

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2012-04-06 19:09:26 +0000
+++ data/CMakeLists.txt	2013-09-16 07:14:02 +0000
@@ -1,1 +1,1 @@
-install(FILES noise.desktop DESTINATION share/applications)
+install (FILES noise.desktop DESTINATION share/applications)

=== modified file 'images/CMakeLists.txt'
--- images/CMakeLists.txt	2013-02-14 21:19:13 +0000
+++ images/CMakeLists.txt	2013-09-16 07:14:02 +0000
@@ -2,16 +2,16 @@
 # App icons. These are installed to the system's default theme
 #
 
-set(SYSTEM_DEFAULT_THEME ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor)
+set (SYSTEM_DEFAULT_THEME ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor)
 
-install(FILES icons/16x16/apps/multimedia-audio-player.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/16x16/apps)
-install(FILES icons/22x22/apps/multimedia-audio-player.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/22x22/apps)
-install(FILES icons/24x24/apps/multimedia-audio-player.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/24x24/apps)
-install(FILES icons/32x32/apps/multimedia-audio-player.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/32x32/apps)
-install(FILES icons/48x48/apps/multimedia-audio-player.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/48x48/apps)
-install(FILES icons/64x64/apps/multimedia-audio-player.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/64x64/apps)
-install(FILES icons/128x128/apps/multimedia-audio-player.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/128x128/apps)
-install(FILES icons/128x128/apps/multimedia-audio-player.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/scalable/apps)
+install (FILES icons/16x16/apps/multimedia-audio-player.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/16x16/apps)
+install (FILES icons/22x22/apps/multimedia-audio-player.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/22x22/apps)
+install (FILES icons/24x24/apps/multimedia-audio-player.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/24x24/apps)
+install (FILES icons/32x32/apps/multimedia-audio-player.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/32x32/apps)
+install (FILES icons/48x48/apps/multimedia-audio-player.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/48x48/apps)
+install (FILES icons/64x64/apps/multimedia-audio-player.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/64x64/apps)
+install (FILES icons/128x128/apps/multimedia-audio-player.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/128x128/apps)
+install (FILES icons/128x128/apps/multimedia-audio-player.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/scalable/apps)
 
 #
 # Fallback icons. These compliment the default "hicolor" theme, but are installed to a
@@ -21,46 +21,46 @@
 # Default album image and album shadow. These would not be found by the icon renderer if
 # they were installed to the hicolor sub-directory, since their dimensions are not the ones
 # GTK+ expects to find in a normal icon theme. They work fine in the root icon dir though.
-set(GENERIC_IMAGES
-    icons/albumart.svg
-    icons/albumart-shadow.png
+set (GENERIC_IMAGES
+  icons/albumart.svg
+  icons/albumart-shadow.png
 )
 
-install(FILES ${GENERIC_IMAGES} DESTINATION ${ICON_DIR})
+install (FILES ${GENERIC_IMAGES} DESTINATION ${ICON_DIR})
 
 # location of the fallback icon theme
-set(FALLBACK_THEME_DIR ${ICON_DIR}/hicolor)
-
-set(STATUS_16
-    icons/16x16/status/media-playlist-no-shuffle-symbolic.svg
-    icons/16x16/status/media-playlist-no-repeat-symbolic.svg
-    icons/16x16/status/starred.svg
-    icons/16x16/status/non-starred.svg
-    icons/16x16/status/process-completed-symbolic.svg
-    icons/16x16/status/process-error-symbolic.svg
-    icons/16x16/status/audio-volume-high-symbolic.svg
-    icons/16x16/status/media-playlist-repeat-one-symbolic.svg
-    icons/16x16/status/media-playlist-repeat-symbolic.svg
-    icons/16x16/status/media-playlist-shuffle-symbolic.svg
-)
-
-set(ACTIONS_16
-    icons/16x16/actions/pane-show-symbolic.svg
-    icons/16x16/actions/pane-hide-symbolic.svg
-    icons/16x16/actions/media-eq-symbolic.svg
-    icons/16x16/actions/list-add-symbolic.svg
-    icons/16x16/actions/love.svg
-    icons/16x16/actions/ban.svg
-)
-
-set(MIMETYPES_16
-    icons/16x16/mimetypes/playlist.svg
-    icons/16x16/mimetypes/playlist-automatic.svg
-    icons/16x16/mimetypes/playlist-queue.svg
-    icons/16x16/mimetypes/library-music.svg
-    icons/16x16/mimetypes/media-cdrom-audio.svg
-)
-
-install(FILES ${STATUS_16} DESTINATION ${FALLBACK_THEME_DIR}/16x16/status)
-install(FILES ${ACTIONS_16} DESTINATION ${FALLBACK_THEME_DIR}/16x16/actions)
-install(FILES ${MIMETYPES_16} DESTINATION ${FALLBACK_THEME_DIR}/16x16/mimetypes)
+set (FALLBACK_THEME_DIR ${ICON_DIR}/hicolor)
+
+set (STATUS_16
+  icons/16x16/status/media-playlist-no-shuffle-symbolic.svg
+  icons/16x16/status/media-playlist-no-repeat-symbolic.svg
+  icons/16x16/status/starred.svg
+  icons/16x16/status/non-starred.svg
+  icons/16x16/status/process-completed-symbolic.svg
+  icons/16x16/status/process-error-symbolic.svg
+  icons/16x16/status/audio-volume-high-symbolic.svg
+  icons/16x16/status/media-playlist-repeat-one-symbolic.svg
+  icons/16x16/status/media-playlist-repeat-symbolic.svg
+  icons/16x16/status/media-playlist-shuffle-symbolic.svg
+)
+
+set (ACTIONS_16
+  icons/16x16/actions/pane-show-symbolic.svg
+  icons/16x16/actions/pane-hide-symbolic.svg
+  icons/16x16/actions/media-eq-symbolic.svg
+  icons/16x16/actions/list-add-symbolic.svg
+  icons/16x16/actions/love.svg
+  icons/16x16/actions/ban.svg
+)
+
+set (MIMETYPES_16
+  icons/16x16/mimetypes/playlist.svg
+  icons/16x16/mimetypes/playlist-automatic.svg
+  icons/16x16/mimetypes/playlist-queue.svg
+  icons/16x16/mimetypes/library-music.svg
+  icons/16x16/mimetypes/media-cdrom-audio.svg
+)
+
+install (FILES ${STATUS_16} DESTINATION ${FALLBACK_THEME_DIR}/16x16/status)
+install (FILES ${ACTIONS_16} DESTINATION ${FALLBACK_THEME_DIR}/16x16/actions)
+install (FILES ${MIMETYPES_16} DESTINATION ${FALLBACK_THEME_DIR}/16x16/mimetypes)

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2013-06-12 18:04:28 +0000
+++ plugins/CMakeLists.txt	2013-09-16 07:14:02 +0000
@@ -1,17 +1,17 @@
-option(BUILD_PLUGINS "Whether to build plugins or not." ON)
+option (BUILD_PLUGINS "Whether to build plugins or not." ON)
 
 if (BUILD_PLUGINS AND BUILD_SHARED_LIBS)
-    message("-- Plugins enabled")
-
-    # Currently, plugins also depend on the code located at src. This will change in the
-    # future, in order to allow external plugins (plugins will only have access to the core
-    # library).
-    set(DEPS_PACKAGES ${DEPS_PACKAGES} ${SRC_TARGET})
-    include_directories(${CMAKE_BINARY_DIR}/src)
-
-    add_subdirectory(Devices)
-    add_subdirectory(LastFM)
-    add_subdirectory(MPRIS)
+  message("-- Plugins enabled")
+
+  # Currently, plugins also depend on the code located at src. This will change in the
+  # future, in order to allow external plugins (plugins will only have access to the core
+  # library).
+  set (DEPS_PACKAGES ${DEPS_PACKAGES} ${SRC_TARGET})
+  include_directories (${CMAKE_BINARY_DIR}/src)
+
+  add_subdirectory (Devices)
+  add_subdirectory (LastFM)
+  add_subdirectory (MPRIS)
 else ()
-    message("-- Plugins disabled")
+  message ("-- Plugins disabled")
 endif ()

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2012-09-25 06:56:04 +0000
+++ po/CMakeLists.txt	2013-09-16 07:14:02 +0000
@@ -1,3 +1,3 @@
-include(Translations)
-add_translations_directory(${GETTEXT_PACKAGE})
-add_translations_catalog(${GETTEXT_PACKAGE} ../core/ ../src/ ../plugins/)
+include (Translations)
+add_translations_directory (${GETTEXT_PACKAGE})
+add_translations_catalog (${GETTEXT_PACKAGE} ../core/ ../src/ ../plugins/)

=== modified file 'schemas/CMakeLists.txt'
--- schemas/CMakeLists.txt	2012-05-18 20:27:57 +0000
+++ schemas/CMakeLists.txt	2013-09-16 07:14:02 +0000
@@ -1,2 +1,2 @@
-include(GSettings)
-add_schema("org.pantheon.noise.gschema.xml")
+include (GSettings)
+add_schema ("org.pantheon.noise.gschema.xml")

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-09-09 02:42:40 +0000
+++ src/CMakeLists.txt	2013-09-16 07:14:02 +0000
@@ -1,115 +1,115 @@
-set(CLIENT_SOURCE
-    main.vala
-    Noise.vala
-    LibraryWindow.vala
-    LocalLibrary.vala
-    PlaybackManager.vala
-    FileOperator.vala
-    Objects/LyricFetcher.vala
-    Objects/MediaInfo.vala
-    Objects/AlbumInfo.vala
-    Objects/ArtistInfo.vala
-    Objects/TrackInfo.vala
-    Objects/MediaArtCache.vala
-    Objects/CoverartCache.vala
-    Objects/MediaKeyListener.vala
-    Widgets/NavigationArrows.vala
-    Widgets/SmartAlbumRenderer.vala
-    Widgets/TopDisplay.vala
-    Widgets/InfoPanel.vala
-    Widgets/EmbeddedAlert.vala
-    Widgets/SimpleOptionChooser.vala
-    Widgets/PresetList.vala
-    Widgets/SideBar.vala
-    Widgets/SourceListView.vala
-    Widgets/StatusBar.vala
-    Widgets/RatingWidget.vala
-    Widgets/SpaceWidget.vala
-    Widgets/FixedBin.vala
-    Widgets/ViewSelector.vala
-    Widgets/FastView/FastGrid.vala
-    Widgets/FastView/FastGridModel.vala
-    Widgets/FastView/FastList.vala
-    Widgets/FastView/FastListModel.vala
-    DataBase/DataBaseManager.vala
-    DataBase/DataBaseUpdater.vala
-    DataBase/Tables.vala
-    GStreamer/GStreamerTagger.vala
-    GStreamer/Streamer.vala
-    GStreamer/CoverImport.vala
-    Views/ViewContainer.vala
-    Views/Wrappers/ViewWrapper.vala
-    Views/Wrappers/MusicViewWrapper.vala
-    Views/Wrappers/DeviceViewWrapper.vala
-    Views/Wrappers/PlaylistViewWrapper.vala
-    Views/Wrappers/ReadOnlyPlaylistViewWrapper.vala
-    Views/DeviceView.vala
-    Views/DeviceSummaryWidget.vala
-    Views/ContentView.vala
-    Views/ViewTextOverlay.vala
-    Views/GridView/GridLayout.vala
-    Views/GridView/GridView.vala
-    Views/GridView/PopupListView.vala
-    Views/ListView/ListView.vala
-    Views/ListView/ColumnBrowser/BrowserColumnModel.vala
-    Views/ListView/ColumnBrowser/BrowserColumn.vala
-    Views/ListView/ColumnBrowser/ColumnBrowser.vala
-    Views/ListView/ColumnBrowser/MusicColumnBrowser.vala
-    Views/ListView/Lists/ListColumn.vala
-    Views/ListView/Lists/TreeViewSetup.vala
-    Views/ListView/Lists/CellDataFunctionHelper.vala
-    Views/ListView/Lists/GenericList.vala
-    Views/ListView/Lists/MusicListView.vala
-    Dialogs/EqualizerWindow.vala
-    Dialogs/SmartPlaylistEditor.vala
-    Dialogs/PreferencesWindow.vala
-    Dialogs/InstallGstreamerPluginsDialog.vala
-    Dialogs/MediaEditor.vala
-    Dialogs/FileNotFoundDialog.vala
-    Dialogs/RemoveFilesDialog.vala
-    Dialogs/NotImportedWindow.vala
-    Dialogs/SetMusicFolderConfirmation.vala
-    Dialogs/TransferFromDeviceDialog.vala
-    Dialogs/SyncWarningDialog.vala
+set (CLIENT_SOURCE
+  main.vala
+  Noise.vala
+  LibraryWindow.vala
+  LocalLibrary.vala
+  PlaybackManager.vala
+  FileOperator.vala
+  Objects/LyricFetcher.vala
+  Objects/MediaInfo.vala
+  Objects/AlbumInfo.vala
+  Objects/ArtistInfo.vala
+  Objects/TrackInfo.vala
+  Objects/MediaArtCache.vala
+  Objects/CoverartCache.vala
+  Objects/MediaKeyListener.vala
+  Widgets/NavigationArrows.vala
+  Widgets/SmartAlbumRenderer.vala
+  Widgets/TopDisplay.vala
+  Widgets/InfoPanel.vala
+  Widgets/EmbeddedAlert.vala
+  Widgets/SimpleOptionChooser.vala
+  Widgets/PresetList.vala
+  Widgets/SideBar.vala
+  Widgets/SourceListView.vala
+  Widgets/StatusBar.vala
+  Widgets/RatingWidget.vala
+  Widgets/SpaceWidget.vala
+  Widgets/FixedBin.vala
+  Widgets/ViewSelector.vala
+  Widgets/FastView/FastGrid.vala
+  Widgets/FastView/FastGridModel.vala
+  Widgets/FastView/FastList.vala
+  Widgets/FastView/FastListModel.vala
+  DataBase/DataBaseManager.vala
+  DataBase/DataBaseUpdater.vala
+  DataBase/Tables.vala
+  GStreamer/GStreamerTagger.vala
+  GStreamer/Streamer.vala
+  GStreamer/CoverImport.vala
+  Views/ViewContainer.vala
+  Views/Wrappers/ViewWrapper.vala
+  Views/Wrappers/MusicViewWrapper.vala
+  Views/Wrappers/DeviceViewWrapper.vala
+  Views/Wrappers/PlaylistViewWrapper.vala
+  Views/Wrappers/ReadOnlyPlaylistViewWrapper.vala
+  Views/DeviceView.vala
+  Views/DeviceSummaryWidget.vala
+  Views/ContentView.vala
+  Views/ViewTextOverlay.vala
+  Views/GridView/GridLayout.vala
+  Views/GridView/GridView.vala
+  Views/GridView/PopupListView.vala
+  Views/ListView/ListView.vala
+  Views/ListView/ColumnBrowser/BrowserColumnModel.vala
+  Views/ListView/ColumnBrowser/BrowserColumn.vala
+  Views/ListView/ColumnBrowser/ColumnBrowser.vala
+  Views/ListView/ColumnBrowser/MusicColumnBrowser.vala
+  Views/ListView/Lists/ListColumn.vala
+  Views/ListView/Lists/TreeViewSetup.vala
+  Views/ListView/Lists/CellDataFunctionHelper.vala
+  Views/ListView/Lists/GenericList.vala
+  Views/ListView/Lists/MusicListView.vala
+  Dialogs/EqualizerWindow.vala
+  Dialogs/SmartPlaylistEditor.vala
+  Dialogs/PreferencesWindow.vala
+  Dialogs/InstallGstreamerPluginsDialog.vala
+  Dialogs/MediaEditor.vala
+  Dialogs/FileNotFoundDialog.vala
+  Dialogs/RemoveFilesDialog.vala
+  Dialogs/NotImportedWindow.vala
+  Dialogs/SetMusicFolderConfirmation.vala
+  Dialogs/TransferFromDeviceDialog.vala
+  Dialogs/SyncWarningDialog.vala
 )
 
-set(CLIENT_VALAC_OPTIONS
-    ${GLOBAL_VALAC_OPTIONS}
-    --define=USE_GRANITE_DECORATED_WINDOW
-    #--define=HAVE_ADD_PLAYLIST_AS_BUTTON
-    #--define=HAVE_SMART_ALBUM_COLUMN
-    #--define=ENABLE_EXPERIMENTAL
+set (CLIENT_VALAC_OPTIONS
+  ${GLOBAL_VALAC_OPTIONS}
+  --define=USE_GRANITE_DECORATED_WINDOW
+  #--define=HAVE_ADD_PLAYLIST_AS_BUTTON
+  #--define=HAVE_SMART_ALBUM_COLUMN
+  #--define=ENABLE_EXPERIMENTAL
 )
 
 # Find GTK+ version. A bug with the icon view is supposed to be fixed in version 3.4.3 or higher.
-pkg_check_modules(GTK_ICON_VIEW_BUG_IS_FIXED QUIET gtk+-3.0>=3.4.3)
+pkg_check_modules (GTK_ICON_VIEW_BUG_IS_FIXED QUIET gtk+-3.0>=3.4.3)
 if (GTK_ICON_VIEW_BUG_IS_FIXED_FOUND)
-    message("-- Icon view workaround disabled")
-    set(CLIENT_VALAC_OPTIONS ${CLIENT_VALAC_OPTIONS} --define=GTK_ICON_VIEW_BUG_IS_FIXED)
+  message ("-- Icon view workaround disabled")
+  set (CLIENT_VALAC_OPTIONS ${CLIENT_VALAC_OPTIONS} --define=GTK_ICON_VIEW_BUG_IS_FIXED)
 else ()
-    message("-- Icon view workaround enabled")
+  message ("-- Icon view workaround enabled")
 endif ()
 
-set(CLIENT_VAPI ${SRC_TARGET})
+set (CLIENT_VAPI ${SRC_TARGET})
 
-vala_precompile(CLIENT_VALA_C ${SRC_TARGET}
-    ${CLIENT_SOURCE}
-PACKAGES
-    ${DEPS_PACKAGES}
-OPTIONS
-    ${CLIENT_VALAC_OPTIONS}
-GENERATE_VAPI
-    ${CLIENT_VAPI}
-GENERATE_HEADER
-    ${CLIENT_VAPI}
+vala_precompile (CLIENT_VALA_C ${SRC_TARGET}
+  ${CLIENT_SOURCE}
+  PACKAGES
+  ${DEPS_PACKAGES}
+  OPTIONS
+  ${CLIENT_VALAC_OPTIONS}
+  GENERATE_VAPI
+  ${CLIENT_VAPI}
+  GENERATE_HEADER
+  ${CLIENT_VAPI}
 )
 
-set(EXEC_NAME ../${SRC_TARGET})
-
-add_definitions(${DEPS_CFLAGS})
-link_directories(${DEPS_LIBRARY_DIRS})
-add_executable(${EXEC_NAME} ${CLIENT_VALA_C})
-
-target_link_libraries(${EXEC_NAME} ${DEPS_LIBRARIES})
-
-install(TARGETS ${EXEC_NAME} RUNTIME DESTINATION bin)
+set (EXEC_NAME ../${SRC_TARGET})
+
+add_definitions (${DEPS_CFLAGS})
+link_directories (${DEPS_LIBRARY_DIRS})
+add_executable (${EXEC_NAME} ${CLIENT_VALA_C})
+
+target_link_libraries (${EXEC_NAME} ${DEPS_LIBRARIES})
+
+install (TARGETS ${EXEC_NAME} RUNTIME DESTINATION bin)