Merge lp:~pete-woods/hud/cmake-cleanup into lp:hud/phablet

[Pete Woods]

Clean up CMake variables and make it so that LOCAL_INSTALL applies to gsettings, too

Clean up CMake variables and make it so that LOCAL_INSTALL applies to gsettings, too

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:362
http://s-jenkins:8080/job/hud-small-ci/292/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/hud-small-ci/./build=pbuilder,distribution=quantal,flavor=i386/292

Click here to trigger a rebuild:
http://s-jenkins:8080/job/hud-small-ci/292/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Looks good

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-03-28 02:50:17 +0000
+++ CMakeLists.txt	2013-04-02 08:41:25 +0000
@@ -10,12 +10,12 @@
    message(FATAL_ERROR "In-tree build attempt detected, aborting. Set your build dir outside your source dir, delete CMakeCache.txt from source root and try again.")
 endif()
 
-option(enable_tests "Enable tests." ON)
-option(enable_voice_tests "Enable voice tests" ON)
-option(enable_scalability_tests "Additional scalability tests that are potentially very slow to run." OFF)
-option(full_warnings "Full compiler warnings." OFF)
-option(debug_messages "Print debug messages." OFF)
-option(local_install "Support local installation." OFF)
+option(ENABLE_TESTS "Enable tests." ON)
+option(ENABLE_VOICE_TESTS "Enable voice tests" ON)
+option(ENABLE_SCALABILITY_TESTS "Additional scalability tests that are potentially very slow to run." OFF)
+option(FULL_WARNINGS "Full compiler warnings." OFF)
+option(DEBUG_MESSAGES "Print debug messages." OFF)
+option(LOCAL_INSTALL "Support local installation." OFF)
 
 find_package(PkgConfig REQUIRED)
 include(GNUInstallDirs)
@@ -34,11 +34,11 @@
   set(CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}")
 endif()
 
-if(${full_warnings})
+if(${FULL_WARNINGS})
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic")
 endif()
 
-if(${debug_messages})
+if(${DEBUG_MESSAGES})
   add_definitions(-DDEBUG_MESSAGES)
 endif()
 
@@ -106,14 +106,14 @@
   include_directories(${BAMF_INCLUDE_DIRS})
 endif()
 
-if(${local_install})
+if(${LOCAL_INSTALL})
   set(DBUSSERVICEDIR "${CMAKE_INSTALL_DATADIR}/dbus-1/services/")
 else()
   EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS dbus-1 --variable session_bus_services_dir OUTPUT_VARIABLE DBUSSERVICEDIR )
 endif()
 message("Installing DBus services to ${DBUSSERVICEDIR}")
 
-if(${local_install})
+if(${LOCAL_INSTALL})
   set(DBUSIFACEDIR "${CMAKE_INSTALL_DATADIR}/dbus-1/interfaces/")
 else()
   EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS dbus-1 --variable interfaces_dir OUTPUT_VARIABLE DBUSIFACEDIR )
@@ -132,7 +132,7 @@
 add_subdirectory(src)
 add_subdirectory(tools)
 
-if(${enable_tests})
+if(${ENABLE_TESTS})
   enable_testing()
   
   pkg_check_modules(DBUSTEST REQUIRED dbustest-1)

=== modified file 'build.sh'
--- build.sh	2013-03-27 18:22:19 +0000
+++ build.sh	2013-04-02 08:41:25 +0000
@@ -13,6 +13,6 @@
 echo "Using $BUILD_COMMAND to build"
 (
   cd build
-  cmake .. $EXTRA_ARGS -DCMAKE_INSTALL_PREFIX=../../install -Dlocal_install=ON -DGSETTINGS_LOCALINSTALL=ON
+  cmake .. $EXTRA_ARGS -DCMAKE_INSTALL_PREFIX=../../install -DLOCAL_INSTALL=ON
   $BUILD_COMMAND
 )

=== modified file 'cmake/UseGSettings.cmake'
--- cmake/UseGSettings.cmake	2013-03-27 23:46:44 +0000
+++ cmake/UseGSettings.cmake	2013-04-02 08:41:25 +0000
@@ -1,6 +1,6 @@
 # GSettings.cmake, CMake macros written for Marlin, feel free to re-use them.
 
-option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" OFF)
+option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" ${LOCAL_INSTALL})
 
 option (GSETTINGS_COMPILE "Compile GSettings Schemas after installation" ${GSETTINGS_LOCALINSTALL})
 

=== modified file 'debian/rules'
--- debian/rules	2013-03-28 02:50:17 +0000
+++ debian/rules	2013-04-02 08:41:25 +0000
@@ -8,7 +8,7 @@
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DDEBIAN_TARGET_DIR="${DEBIAN_TARGET_DIR}" -Denable_voice_tests=OFF
+	dh_auto_configure -- -DDEBIAN_TARGET_DIR="${DEBIAN_TARGET_DIR}" -DENABLE_VOICE_TESTS=OFF
 
 override_dh_install:
-	dh_install --fail-missing
\ No newline at end of file
+	dh_install --fail-missing

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-03-29 16:38:22 +0000
+++ tests/CMakeLists.txt	2013-04-02 08:41:25 +0000
@@ -159,7 +159,7 @@
 # Voice tests (needs working pulse)
 ####################################
 
-if(${enable_voice_tests})
+if(${ENABLE_VOICE_TESTS})
   hudtest(test-voice test-voice.c test-voice.xml)
 endif()
 
@@ -173,7 +173,7 @@
   hud-test
   ${GIO2_LIBRARIES}
 )
-if(${enable_scalability_tests})
+if(${ENABLE_SCALABILITY_TESTS})
   add_test(hud-performance
     "${CMAKE_CURRENT_SOURCE_DIR}/test-runner.sh"
     "${CMAKE_CURRENT_SOURCE_DIR}"