summaryrefslogtreecommitdiff
path: root/libopenjpeg
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2007-09-25 14:54:49 +0000
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2007-09-25 14:54:49 +0000
commit6265dcfb119e80ce02a11d116ab3d06a2afa1795 (patch)
tree267acb78aca26cd20b670ef470dfea3737ee1727 /libopenjpeg
parent7e40a9475a8c29239b46133ee61675fe6cc76e92 (diff)
BUG: Fix previous patch from Callum Lerwick. I have no clue what CMAKE_INSTALL_LIBDIR refers too. Bump up cmake 2.2 restriction to cmake 2.4 because of previous patch not backward compatible. Properly set the SOVERSION in a cross plateform way (yes WIN32 is a plateform)
Diffstat (limited to 'libopenjpeg')
-rw-r--r--libopenjpeg/CMakeLists.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/libopenjpeg/CMakeLists.txt b/libopenjpeg/CMakeLists.txt
index c08d2a54..2814ad40 100644
--- a/libopenjpeg/CMakeLists.txt
+++ b/libopenjpeg/CMakeLists.txt
@@ -33,12 +33,11 @@ ENDIF(WIN32)
# Create the library
ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES
- SOVERSION ${OPENJPEG_SOVERSION}
- VERSION ${OPENJPEG_SOVERSION}.${OPENJPEG_VERSION})
+ ${OPENJPEG_LIBRARY_PROPERTIES})
# Install library
INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
- DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ DESTINATION lib)
# Install includes files
INSTALL(FILES openjpeg.h