diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-06-20 18:44:26 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2013-06-20 18:44:26 -0500 |
| commit | 3d4daff706c39fb6ebdd29b950f3f0ea1402116d (patch) | |
| tree | 2f52ceb0273146624625f0c3e1114cd3f2990868 /cmake | |
| parent | 59caa78d5ac6410fea8da709189f41fa86e6a2a7 (diff) | |
| download | ayatana-indicator-session-3d4daff706c39fb6ebdd29b950f3f0ea1402116d.tar.gz ayatana-indicator-session-3d4daff706c39fb6ebdd29b950f3f0ea1402116d.tar.bz2 ayatana-indicator-session-3d4daff706c39fb6ebdd29b950f3f0ea1402116d.zip | |
cmake: fix variables in data/CMakeLists.txt, make status messages more consistent
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/UseGSettings.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmake/UseGSettings.cmake b/cmake/UseGSettings.cmake index 3d8ae1c..c8ea30c 100644 --- a/cmake/UseGSettings.cmake +++ b/cmake/UseGSettings.cmake @@ -15,12 +15,13 @@ endif() macro(add_schema SCHEMA_NAME) set(PKG_CONFIG_EXECUTABLE pkg-config) + set(SCHEMA_SUFFIX "share/glib-2.0/schemas") # Have an option to not install the schema into where GLib is if (GSETTINGS_LOCALINSTALL) - SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/") + SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/${SCHEMA_SUFFIX}") else (GSETTINGS_LOCALINSTALL) execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE) - SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/") + SET (GSETTINGS_DIR "${_glib_prefix}/${SCHEMA_SUFFIX}") endif (GSETTINGS_LOCALINSTALL) # Run the validator and error if it fails @@ -32,7 +33,7 @@ macro(add_schema SCHEMA_NAME) endif (_schemas_invalid) # Actually install and recomple schemas - message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}") + message (STATUS "${GSETTINGS_DIR} is the GSettings install dir") install (FILES ${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL) if (GSETTINGS_COMPILE) |