Запись генерируемых файлов в каталог myx/base

2020-04-21 12:28:44 +03:00 · 2020-04-21 12:28:44 +03:00 · b845211222
commit b845211222
parent ab740f7795
3 changed files with 4 additions and 18 deletions
--- 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)
--- a/cmake/cmlib
+++ b/cmake/cmlib
@ -1 +1 @@
-Subproject commit 2909f5a9d42ea4b0182329941a52b83e60c720d6
+Subproject commit e5fbb9023546a5e98c832e8596586c71edcc5b2f
--- 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 <dev@246060.ru>")
 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)