From 90b0d3b7efad5d885cba19b2b03163ae8ffddd1d Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 3 Nov 2018 19:46:23 +0100 Subject: [PATCH] Cleanup pkgconfig comments re multi-arch --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b86c8fa..100a67df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -323,14 +323,13 @@ else() option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" OFF) endif() if(BUILD_PKGCONFIG_FILES) - # install in lib and not share (see multi-arch note above) +# install in lib and not share (CMAKE_INSTALL_LIBDIR takes care of it for multi-arch) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) # if(BUILD_JPWL) - # install in lib and not share (see multi-arch note above) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION @@ -338,7 +337,6 @@ if(BUILD_PKGCONFIG_FILES) endif() # if(BUILD_JPIP) - # install in lib and not share (see multi-arch note above) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION @@ -346,7 +344,6 @@ if(BUILD_PKGCONFIG_FILES) endif() # if(BUILD_JP3D) - # install in lib and not share (see multi-arch note above) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION