~brandontschaefer/unity/lp.1108956-fix

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Tarmac
  • Author(s): Marco Trevisan (Treviño)
  • Date: 2013-04-03 21:19:56 UTC
  • mfrom: (3270.2.1 trunk)
  • Revision ID: tarmac-20130403211956-pw0gzwd7l3mg2zii
CMakeLists.txt: fix unity components path, removing magic number and }.

Approved by PS Jenkins bot, Stephen M. Webb.

Show diffs side-by-side

added added

removed removed

Lines of Context:
13
13
set (UNITY_MICRO 0)
14
14
set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
15
15
set (UNITY_API_VERSION "6.0")
 
16
set (UNITY_COMPONENTS_VERSION "6")
16
17
 
17
18
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGNOME_DESKTOP_USE_UNSTABLE_API -std=c++0x -fno-permissive")
18
19
set (CMAKE_CXX_FLAGS_DEBUG "-g3")
129
130
#
130
131
set (PREFIXDIR "${CMAKE_INSTALL_PREFIX}")
131
132
set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
132
 
set (PKGDATADIR "${DATADIR}/unity/6}")
 
133
set (PKGDATADIR "${DATADIR}/unity/${UNITY_COMPONENTS_VERSION}")
133
134
set (GETTEXT_PACKAGE "unity")
134
135
set (LOCALE_DIR "${DATADIR}/locale")
135
136
set (VERSION "${UNITY_VERSION}")