~tatokis/unity/gcc-72-errors

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Marco Trevisan (Treviño)
  • Date: 2016-08-31 15:05:58 UTC
  • mto: (4153.9.32 systemd-unit-fixes)
  • mto: This revision was merged to the branch mainline in revision 4191.
  • Revision ID: mail@3v1n0.net-20160831150558-wiky13q96ug5fib2
CMake: use UNITY_LIBDIR in a more shared way

Show diffs side-by-side

added added

removed removed

Lines of Context:
158
158
#
159
159
set (VERSION "${UNITY_VERSION}")
160
160
set (PREFIXPATH "${CMAKE_INSTALL_PREFIX}")
161
 
set (UNITYLIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}")
162
 
set (UNITYDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}")
 
161
set (UNITY_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}")
 
162
set (UNITY_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}")
 
163
set (UNITY_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}")
163
164
set (PKGDATADIR "${UNITYDATADIR}/icons")
164
165
set (SOURCEDATADIR "${CMAKE_CURRENT_SOURCE_DIR}/resources")
165
166
set (BUILDDIR "${CMAKE_BINARY_DIR}")