From b845211222ec861a263d5d7018b2fc200c18da23 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Tue, 21 Apr 2020 12:28:44 +0300 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BF=D0=B8=D1=81=D1=8C=20=D0=B3?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D1=80=D0=B8=D1=80=D1=83=D0=B5=D0=BC=D1=8B?= =?UTF-8?q?=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=B2=20=D0=BA?= =?UTF-8?q?=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=20myx/base?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- cmake/cmlib | 2 +- cmake/etc/Variables.cmake | 18 ++---------------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ca947f..cc3b160 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ find_package( cmlib_config_hpp_generate() configure_file(${CMAKE_SOURCE_DIR}/src/myx/base/config_flags.hpp.in - ${CMAKE_BINARY_DIR}/include/config_flags.hpp) + ${CMAKE_BINARY_DIR}/include/myx/base/config_flags.hpp) # Подключение внешних проектов include(ExternalProject) diff --git a/cmake/cmlib b/cmake/cmlib index 2909f5a..e5fbb90 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 2909f5a9d42ea4b0182329941a52b83e60c720d6 +Subproject commit e5fbb9023546a5e98c832e8596586c71edcc5b2f diff --git a/cmake/etc/Variables.cmake b/cmake/etc/Variables.cmake index 6527d36..6c69788 100644 --- a/cmake/etc/Variables.cmake +++ b/cmake/etc/Variables.cmake @@ -10,19 +10,5 @@ set(CPACK_COMPONENTS_ALL EXAMPLES) set(CPACK_GENERATOR "TXZ;DEB") set(CPACK_PACKAGE_CONTACT "Andrei Astafev ") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mixed functions") -set(CPACK_DEBIAN_PACKAGE_SECTION "misc") -set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional") -set(CPACK_SOURCE_IGNORE_FILES - .git/ - obj.*/ - build - files/var - debian/tmp/ - debian/files - debian/.*\\\\.log$ - debian/.*.substvars - debian/stamp.* - CMakeLists.txt.user - cmake/lib/.git$ - ~$ - \\\\..*\\\\.swp$) + +set(CMLIB_GENERATED_HEADERS_PATH ${CMAKE_BINARY_DIR}/include/myx/base)