diff --git a/CMakeLists.txt b/CMakeLists.txt index 758e781..eebfa5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,15 @@ option(CPPKAFKA_BOOST_STATIC_LIBS "Link with Boost static libraries." ON) option(CPPKAFKA_BOOST_USE_MULTITHREADED "Use Boost multithreaded libraries." ON) option(CPPKAFKA_RDKAFKA_STATIC_LIB "Link with Rdkafka static library." OFF) +math(EXPR BITS "8*${CMAKE_SIZEOF_VOID_P}") + +# Properly set the output directory +if (${BITS} EQUAL 64) + set(LIBDIR "lib64") +else() + set(LIBDIR "lib") +endif() + # Disable output from find_package macro if (NOT CPPKAFKA_CMAKE_VERBOSE) set(FIND_PACKAGE_QUIET QUIET) diff --git a/cppkafka.pc.in b/cppkafka.pc.in index 9a4489d..7d57325 100644 --- a/cppkafka.pc.in +++ b/cppkafka.pc.in @@ -1,14 +1,14 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${prefix}/lib -sharedlibdir=${prefix}/lib +libdir=${prefix}/@LIBDIR@ +sharedlibdir=${prefix}/@LIBDIR@ includedir=${prefix}/include Name: cppkafka Url: https://github.com/mfontanini/cppkafka Description: C++ wrapper library on top of RdKafka Version: @CPPKAFKA_VERSION@ -Requires: rdkafka >= 0.9.4 boost -Requires.private: -Libs: -L${libdir} -L${sharedlibdir} -L@RDKAFKA_ROOT_DIR@/lib -lcppkafka -lrdkafka -lpthread -lrt -lssl -lcrypto -ldl -lz -Cflags: -I${includedir} -I${includedir}/cppkafka -I@RDKAFKA_INCLUDE_DIR@ -I@Boost_INCLUDE_DIRS@ +Requires: +Requires.private: rdkafka >= 0.9.4, boost +Libs: -L${libdir} -L${sharedlibdir} -lcppkafka +Cflags: -I${includedir} -I${includedir}/cppkafka diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ff0fba1..d5d50fe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -43,8 +43,8 @@ target_include_directories(cppkafka PUBLIC ${PROJECT_SOURCE_DIR}/include) install( TARGETS cppkafka - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + LIBRARY DESTINATION ${LIBDIR} + ARCHIVE DESTINATION ${LIBDIR} COMPONENT dev )