diff --git a/CMakeLists.txt b/CMakeLists.txt index ed73e52..d890c93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,8 @@ find_package(Threads REQUIRED) # Qt5 find_package(Qt5 COMPONENTS Core Network REQUIRED) +cmlib_generate_private_config_hpp() + # Библиотеки add_subdirectory(src/myx/backports/compiler) add_subdirectory(src/myx/backports/cpp) diff --git a/cmake/cmlib b/cmake/cmlib index 8fbf0a3..dbc0b76 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 8fbf0a3b3d8ef4598fe5c334067e2de321e04dae +Subproject commit dbc0b76a76be90fa9875ad7ab8114dc9d487ee64 diff --git a/cmake/etc/Variables.cmake b/cmake/etc/Variables.cmake index 8670e38..247ad53 100644 --- a/cmake/etc/Variables.cmake +++ b/cmake/etc/Variables.cmake @@ -8,5 +8,3 @@ set(DOXYGEN_GENERATE_HTML YES) set(CPACK_COMPONENTS_ALL examples) set(CPACK_PACKAGE_CONTACT "Andrei Astafev ") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mixed functions") - -set(CMLIB_GENERATED_HEADERS_PATH ${CMAKE_BINARY_DIR}/include/myx/core) diff --git a/src/myx/core/CMakeLists.txt b/src/myx/core/CMakeLists.txt index 8c6a34a..c4eef63 100644 --- a/src/myx/core/CMakeLists.txt +++ b/src/myx/core/CMakeLists.txt @@ -36,8 +36,6 @@ add_format_sources(${TRGT} ${TRGT_cpp} ${TRGT_headers}) target_include_directories(${TRGT} INTERFACE ${CMAKE_SOURCE_DIR}/src) generate_pkgconfig(myx-${TRGT} COMPONENT base-dev INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) -install(FILES ${TRGT_headers} ${CMAKE_BINARY_DIR}/include/myx/core/compiler_features.hpp COMPONENT base-dev - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT}) # Цель, используемая только для установки заголовочных файлов без компиляции проекта add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=base-dev -P