From f2ca23547efcb8ffbc0dd22f4daba1f7ce2c0260 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 26 Dec 2013 06:01:01 +0100 Subject: Use LIB_SUFFIX in pkg-config information --- CMakeLists.txt | 4 +++- libuecc.pc.in | 2 +- src/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ac0e20..9cd7406 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,10 +9,12 @@ set(DOXYFILE_EXTRA_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/include") include(UseDoxygen OPTIONAL) +set(LIBDIR "lib${LIB_SUFFIX}") + add_subdirectory(src) configure_file(${LIBUECC_SOURCE_DIR}/libuecc.pc.in ${LIBUECC_BINARY_DIR}/libuecc.pc @ONLY) -install(FILES ${LIBUECC_BINARY_DIR}/libuecc.pc DESTINATION "lib/pkgconfig") +install(FILES ${LIBUECC_BINARY_DIR}/libuecc.pc DESTINATION "${LIBDIR}/pkgconfig") FILE(GLOB include_files "${CMAKE_CURRENT_SOURCE_DIR}/include/libuecc/*.h") install(FILES ${include_files} DESTINATION "include/libuecc-${PROJECT_VERSION}/libuecc") diff --git a/libuecc.pc.in b/libuecc.pc.in index 5ddb020..9e50f3b 100644 --- a/libuecc.pc.in +++ b/libuecc.pc.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=${exec_prefix}/@LIBDIR@ includedir=${prefix}/include Name: libuecc diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 96796ec..88f4713 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,7 +18,7 @@ set_target_properties(uecc_static PROPERTIES ) install(TARGETS uecc_shared uecc_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} - LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION ${LIBDIR} + LIBRARY DESTINATION ${LIBDIR} RUNTIME DESTINATION bin ) -- cgit v1.2.3