From 501260eb542d25227d9951193baec42fbf55c307 Mon Sep 17 00:00:00 2001 From: Jason Newton Date: Mon, 1 Sep 2014 21:42:44 -0700 Subject: [PATCH] correct paths for x86_64/generic installations --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ee162dd..195500e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,10 +155,14 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") ENDIF () ENDIF () -INSTALL (TARGETS msgpack msgpack-static DESTINATION lib) +IF (NOT DEFINED CMAKE_INSTALL_LIBDIR) + SET(CMAKE_INSTALL_LIBDIR lib) +ENDIF () + +INSTALL (TARGETS msgpack msgpack-static DESTINATION ${CMAKE_INSTALL_LIBDIR}) INSTALL (DIRECTORY src/msgpack DESTINATION include) INSTALL (FILES src/msgpack.h src/msgpack.hpp DESTINATION include) -INSTALL (FILES msgpack.pc DESTINATION lib/pkgconfig) +INSTALL (FILES ${CMAKE_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) # Doxygen FIND_PACKAGE (Doxygen)