From d6c1e11d49c5857291a5e469f71d3b7e5ac6c321 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 24 Apr 2020 20:35:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibAuxilarySymlinks.cmake | 18 ++++++++++++------ CMLibPkgConfig.cmake | 3 ++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CMLibAuxilarySymlinks.cmake b/CMLibAuxilarySymlinks.cmake index 4d86ba6..6a60591 100644 --- a/CMLibAuxilarySymlinks.cmake +++ b/CMLibAuxilarySymlinks.cmake @@ -1,3 +1,4 @@ +# cmake-format: off if(NOT TARGET create_auxilary_symlinks) if(UNIX) add_custom_target( @@ -5,15 +6,20 @@ if(NOT TARGET create_auxilary_symlinks) WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/files # Ссылка на каталог с журналами - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/log ${CMAKE_BINARY_DIR}/files/log + COMMAND ${CMAKE_COMMAND} -E create_symlink + ${CMAKE_SOURCE_DIR}/files/log ${CMAKE_BINARY_DIR}/files/log # Ссылка на каталог с обрабатываемыми данными - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/lib ${CMAKE_BINARY_DIR}/files/lib + COMMAND ${CMAKE_COMMAND} -E create_symlink + ${CMAKE_SOURCE_DIR}/files/lib ${CMAKE_BINARY_DIR}/files/lib # Ссылка на каталог с временными данными - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/cache - ${CMAKE_BINARY_DIR}/files/cache + COMMAND ${CMAKE_COMMAND} -E create_symlink + ${CMAKE_SOURCE_DIR}/files/cache ${CMAKE_BINARY_DIR}/files/cache # Ссылка на каталог с постоянными данными - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/data ${CMAKE_BINARY_DIR}/files/data + COMMAND ${CMAKE_COMMAND} -E create_symlink + ${CMAKE_SOURCE_DIR}/files/data ${CMAKE_BINARY_DIR}/files/data # Ссылка на каталог настроек - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/etc ${CMAKE_BINARY_DIR}/etc) + COMMAND ${CMAKE_COMMAND} -E create_symlink + ${CMAKE_SOURCE_DIR}/files/etc ${CMAKE_BINARY_DIR}/etc) endif() endif() +# cmake-format: on diff --git a/CMLibPkgConfig.cmake b/CMLibPkgConfig.cmake index aaef671..afcb1ca 100644 --- a/CMLibPkgConfig.cmake +++ b/CMLibPkgConfig.cmake @@ -10,5 +10,6 @@ function(generate_pkgconfig library_name) else() configure_file(${CMLIB_MODULE_DIR}/pc/lib-header-only.pc.in ${CMAKE_BINARY_DIR}/${library_name}.pc) endif() - install(FILES ${CMAKE_BINARY_DIR}/${library_name}.pc COMPONENT ${_PKG_COMPONENT} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + install(FILES ${CMAKE_BINARY_DIR}/${library_name}.pc COMPONENT ${_PKG_COMPONENT} + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) endfunction()