Merge lp:~libertine-team/libertine-scope/cmake-fixes into lp:libertine-scope

[Kyle Nitzsche]

Hi.

This scope did not build (or runnably install) for me until I made the cmake changes in this MR.

In various CMakeLists.txts:
* install ini file names to be fully qualified
* install .so file as fully qualified name
* set install dir correctly

[Christopher Townsend (townsend)]

Thanks for this MP. Please see inline comments.

review: Needs Fixing

[Kyle Nitzsche (knitzsche)]

On 05/31/2016 12:34 PM, Christopher Townsend wrote:
> Review: Needs Fixing
>
> Thanks for this MP. Please see inline comments.
>
> Diff comments:
>
>> === modified file 'CMakeLists.txt'
>> --- CMakeLists.txt 2016-05-04 13:56:45 +0000
>> +++ CMakeLists.txt 2016-05-20 21:00:48 +0000
>> @@ -42,11 +42,13 @@
>> ${LIBERTINE_INCLUDE_DIRS}
>> )
>>
>> +set(PACKAGE_NAME "libertine-scope.canonical")
>> +set(APP ${PROJECT})
>> +
>> # Important project paths
>> -set(SCOPE_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/unity-scopes/libertine-scope/)
>> +set(SCOPE_INSTALL_DIR "/libertine-scope")
>
> Setting this will install the files to /libertine-scope when installing as a Debian package, which is what we don't want. Users will want to install this on Unity 8 desktop.

I was only aware of the need to install for click not debian, which have
different install paths. As we discussed in irc, perhaps you can add a
script to build the click (thus handling the install path issue) and we
can keep this MPs changes that install the click using fully qualified ID.

>
>> set(SCOPE_NAME "libertine-scope")
>> set(GETTEXT_PACKAGE "${SCOPE_NAME}")
>> -set(PACKAGE_NAME "libertine-scope.canonical")
>>
>> # If we need to refer to the scope's name or package in code, these definitions will help
>> add_definitions(-DPACKAGE_NAME="${PACKAGE_NAME}")
>> @@ -62,9 +64,9 @@
>> # Configure and install the click manifest and apparmor files
>> configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
>> install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
>> - DESTINATION ${SCOPE_INSTALL_DIR})
>> + DESTINATION "/")
>
> Same idea as above, but this will install it to /. Definitely not what we want.
>
>> install(FILES "libertine-scope.apparmor"
>> - DESTINATION ${SCOPE_INSTALL_DIR})
>> + DESTINATION "/")
>
> See above.
>
>>
>> # Add our main directories
>> add_subdirectory(libertine-scope)
>
>

[lp:~libertine-team/libertine-scope/cmake-fixes]

39. By Kyle Nitzsche on 2016-05-31

To accommodate the priority to build debian pkgs, this commit reverts the
three changes to the install dir for clicks (so for now building a click requires
manual intervention)

[Christopher Townsend (townsend)]

One very small nit inline and we are good.

[lp:~libertine-team/libertine-scope/cmake-fixes]

40. By Kyle Nitzsche on 2016-05-31

remove extra empty line

[Christopher Townsend (townsend)]

Great, thanks!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-05-04 13:56:45 +0000
+++ CMakeLists.txt	2016-05-31 19:53:32 +0000
@@ -42,11 +42,13 @@
   ${LIBERTINE_INCLUDE_DIRS}
 )
 
+set(PACKAGE_NAME "libertine-scope.canonical")
+set(APP ${PROJECT})
+
 # Important project paths
 set(SCOPE_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/unity-scopes/libertine-scope/)
 set(SCOPE_NAME "libertine-scope")
 set(GETTEXT_PACKAGE "${SCOPE_NAME}")
-set(PACKAGE_NAME "libertine-scope.canonical")
 
 # If we need to refer to the scope's name or package in code, these definitions will help
 add_definitions(-DPACKAGE_NAME="${PACKAGE_NAME}")

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-01-07 19:35:25 +0000
+++ data/CMakeLists.txt	2016-05-31 19:53:32 +0000
@@ -3,13 +3,13 @@
 # .so file so that the test tools can find them.
 intltool_merge_translations(
   "libertine-scope.ini.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NAME}.ini"
+  "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_${SCOPE_NAME}.ini"
   ALL
   UTF8
 )
 intltool_merge_translations(
   "libertine-scope-settings.ini.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NAME}-settings.ini"
+  "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_${SCOPE_NAME}-settings.ini"
   ALL
   UTF8
 )
@@ -17,8 +17,8 @@
 # Install the scope ini files
 install(
   FILES
-    "${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NAME}.ini"
-    "${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NAME}-settings.ini"
+    "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_${SCOPE_NAME}.ini"
+    "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_${SCOPE_NAME}-settings.ini"
   DESTINATION
     ${SCOPE_INSTALL_DIR}
 )

=== modified file 'libertine-scope/CMakeLists.txt'
--- libertine-scope/CMakeLists.txt	2016-04-27 16:33:00 +0000
+++ libertine-scope/CMakeLists.txt	2016-05-31 19:53:32 +0000
@@ -27,7 +27,7 @@
 
 set_target_properties(scope
   PROPERTIES
-    OUTPUT_NAME "${SCOPE_NAME}"
+    OUTPUT_NAME "${PACKAGE_NAME}_${SCOPE_NAME}"
 )
 
 install(TARGETS scope

=== modified file 'po/libertine-scope.pot'
--- po/libertine-scope.pot	2016-04-27 18:37:46 +0000
+++ po/libertine-scope.pot	2016-05-31 19:53:32 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-27 14:37-0400\n"
+"POT-Creation-Date: 2016-05-20 20:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"