1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-07-21 14:05:20 +0000
3
+++ CMakeLists.txt	2016-07-21 14:15:27 +0000
4
@@ -36,7 +36,8 @@
5
36
set(APPS_DATA_DIR ${CMAKE_INSTALL_FULL_DATADIR}/unity/scopes/libertine-scope/)
36
set(APPS_DATA_DIR ${CMAKE_INSTALL_FULL_DATADIR}/unity/scopes/libertine-scope/)
6
37
set(SCOPE_NAME "libertine-scope")
37
set(SCOPE_NAME "libertine-scope")
7
38
set(SCOPE_DISPLAY_NAME "Desktop Apps")
38
set(SCOPE_DISPLAY_NAME "Desktop Apps")
9
39
set(PACKAGE_NAME "libertine-scope.ubuntu_${SCOPE_NAME}")
39
set(PACKAGE_NAME "libertine-scope.ubuntu")
10
40
set(FULLY_QUALIFIED_NAME "${PACKAGE_NAME}_${SCOPE_NAME}")
11
40
option(CLICK_MODE "Installs to a contained location" off)
41
option(CLICK_MODE "Installs to a contained location" off)
12
41
42
13
42
add_definitions(-DSCOPE_NAME="${SCOPE_NAME}")
43
add_definitions(-DSCOPE_NAME="${SCOPE_NAME}")
14
43
44
15
=== modified file 'scope/apps/CMakeLists.txt'
16
--- scope/apps/CMakeLists.txt	2016-07-12 19:33:08 +0000
17
+++ scope/apps/CMakeLists.txt	2016-07-21 14:15:27 +0000
18
@@ -30,14 +30,14 @@
19
30
30
20
31
set_target_properties(apps
31
set_target_properties(apps
21
32
  PROPERTIES
32
  PROPERTIES
23
33
    OUTPUT_NAME ${PACKAGE_NAME}
33
    OUTPUT_NAME ${FULLY_QUALIFIED_NAME}
24
34
)
34
)
25
35
35
26
36
install(TARGETS apps
36
install(TARGETS apps
27
37
  LIBRARY DESTINATION "${APPS_LIB_DIR}"
37
  LIBRARY DESTINATION "${APPS_LIB_DIR}"
28
38
)
38
)
29
39
39
31
40
set(APPS_INI_TARGET ${PACKAGE_NAME}.ini)
40
set(APPS_INI_TARGET ${FULLY_QUALIFIED_NAME}.ini)
32
41
configure_file(
41
configure_file(
33
42
  ${APPS_INI_TARGET}.in.in
42
  ${APPS_INI_TARGET}.in.in
34
43
  ${APPS_INI_TARGET}.in
43
  ${APPS_INI_TARGET}.in
Status:	Merged
Approved by:	Larry Price on 2016-07-21
Approved revision:	56
Merged at revision:	56
Proposed branch:	lp:~townsend/libertine-scope/fix-package-name
Merge into:	lp:libertine-scope
Diff against target:	34 lines (+4/-3) 2 files modified CMakeLists.txt (+2/-1) scope/apps/CMakeLists.txt (+2/-2)
To merge this branch:	bzr merge lp:~townsend/libertine-scope/fix-package-name
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Larry Price		2016-07-21	Approve on 2016-07-21
Libertine CI Bot	continuous-integration		Approve on 2016-07-21
Review via email: mp+300774@code.launchpad.net