← Back to branch summary

~ubuntu-branches/ubuntu/maverick/libpng/maverick-updates

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2010-01-28 11:57:34 UTC
  • mfrom: (1.1.11 upstream) (15.2.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100128115734-5b6dgb3hf38bw9cn
Tags: 1.2.42-1ubuntu1
* Merge from Debian testing.  Remaining changes:
  - Move libpng from /usr/lib to /lib, so that plymouth is usable on
    systems with a separate /usr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
16
16
 
17
17
set(PNGLIB_MAJOR 1)
18
18
set(PNGLIB_MINOR 2)
19
 
set(PNGLIB_RELEASE 41)
 
19
set(PNGLIB_RELEASE 42)
20
20
set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
21
21
set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
22
22
 
193
193
set(libdir      ${CMAKE_INSTALL_PREFIX}/lib)
194
194
set(includedir  ${CMAKE_INSTALL_PREFIX}/include)
195
195
 
196
 
configure_file(${PNG_SOURCE_DIR}/scripts/libpng-pc.in
 
196
configure_file(${PNG_SOURCE_DIR}/scripts/libpng.pc.in
197
197
  ${PNG_BINARY_DIR}/libpng.pc)
198
198
configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in
199
199
  ${PNG_BINARY_DIR}/libpng-config)
200
 
configure_file(${PNG_SOURCE_DIR}/scripts/libpng-pc.in
 
200
configure_file(${PNG_SOURCE_DIR}/scripts/libpng.pc.in
201
201
  ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc)
202
202
configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in
203
203
  ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config)
205
205
# SET UP LINKS
206
206
if(PNG_SHARED)
207
207
  set_target_properties(${PNG_LIB_NAME} PROPERTIES
208
 
#    VERSION 0.${PNGLIB_RELEASE}.1.2.41
 
208
#    VERSION 0.${PNGLIB_RELEASE}.1.2.42
209
209
     VERSION 0.${PNGLIB_RELEASE}.0
210
210
     SOVERSION 0
211
211
     CLEAN_DIRECT_OUTPUT 1)