summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorJunfeng Dong <junfeng.dong@intel.com>2013-03-28 11:38:24 (GMT)
committerlifang <fangx.li@intel.com>2013-04-02 14:42:14 (GMT)
commitdff61810f30c4543a6be9fa44256a77a744beb1f (patch)
tree713d2c250e629d7b37d4325fb93f340b172dd623 /CMakeLists.txt
parent7d034560fa470ba0920b0e2eddb8a2d9417a882a (diff)
downloadlibmedia-thumbnail-dff61810f30c4543a6be9fa44256a77a744beb1f.zip
libmedia-thumbnail-dff61810f30c4543a6be9fa44256a77a744beb1f.tar.gz
libmedia-thumbnail-dff61810f30c4543a6be9fa44256a77a744beb1f.tar.bz2
Fix for 64 bit compatibility.
- Fix hardcoding path. - Use %cmake to set default paths. Change-Id: If8f46c350b6371ee30120df9fde3e9b42c1f41da
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c7439a..a6ac8c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,6 @@ SET(BINDIR "${PREFIX}/bin")
SET(LOCALBINDIR "${PREFIX}/local/bin")
SET(DATADIR "${PREFIX}/share")
SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
SET(INCLUDEDIR "\${prefix}/include")
IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@ -74,9 +73,9 @@ ADD_DEFINITIONS("-D_USE_MEDIA_UTIL_")
SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--hash-style=both")
CONFIGURE_FILE(media-thumbnail.pc.in media-thumbnail.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/media-thumbnail.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/media-thumbnail.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-LINK_DIRECTORIES(lib)
+LINK_DIRECTORIES(${LIB_INSTALL_DIR})
ADD_LIBRARY(${MEDIAHASH-LIB} SHARED ${HASH_SRCS})
SET_TARGET_PROPERTIES(${MEDIAHASH-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
@@ -86,8 +85,8 @@ TARGET_LINK_LIBRARIES(${MEDIATHUMB-LIB} ${pkgs_LDFLAGS} ${MEDIAHASH-LIB})
SET_TARGET_PROPERTIES(${MEDIATHUMB-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
SET_TARGET_PROPERTIES(${MEDIATHUMB-LIB} PROPERTIES VERSION ${VERSION})
-INSTALL(TARGETS ${MEDIATHUMB-LIB} LIBRARY DESTINATION lib)
-INSTALL(TARGETS ${MEDIAHASH-LIB} LIBRARY DESTINATION lib)
+INSTALL(TARGETS ${MEDIATHUMB-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS ${MEDIAHASH-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
ADD_EXECUTABLE(media-thumbnail-server ${THUMB-SERVER})
TARGET_LINK_LIBRARIES(media-thumbnail-server ${pkgs_LDFLAGS} ${MEDIATHUMB-LIB} )