f1x1t/myxlib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Исправлена работа с автогенерируемыми заголовочными файлами

Browse Source
This commit is contained in:
Andrei Astafev 2021-06-01 14:24:25 +03:00
parent b2cb06853e
commit 29b56561ca
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -36,6 +36,8 @@ find_package(Threads REQUIRED)
# Qt5 # Qt5
find_package(Qt5 COMPONENTS Core Network REQUIRED) find_package(Qt5 COMPONENTS Core Network REQUIRED)
cmlib_generate_private_config_hpp()
# Библиотеки # Библиотеки
add_subdirectory(src/myx/backports/compiler) add_subdirectory(src/myx/backports/compiler)
add_subdirectory(src/myx/backports/cpp) add_subdirectory(src/myx/backports/cpp)

2
cmake/cmlib

@ -1 +1 @@
Subproject commit 8fbf0a3b3d8ef4598fe5c334067e2de321e04dae Subproject commit dbc0b76a76be90fa9875ad7ab8114dc9d487ee64

2
cmake/etc/Variables.cmake
View File

@ -8,5 +8,3 @@ set(DOXYGEN_GENERATE_HTML YES)
set(CPACK_COMPONENTS_ALL examples) set(CPACK_COMPONENTS_ALL examples)
set(CPACK_PACKAGE_CONTACT "Andrei Astafev <dev@246060.ru>") set(CPACK_PACKAGE_CONTACT "Andrei Astafev <dev@246060.ru>")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mixed functions") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mixed functions")
set(CMLIB_GENERATED_HEADERS_PATH ${CMAKE_BINARY_DIR}/include/myx/core)

2
src/myx/core/CMakeLists.txt
View File

@ -36,8 +36,6 @@ add_format_sources(${TRGT} ${TRGT_cpp} ${TRGT_headers})
target_include_directories(${TRGT} INTERFACE ${CMAKE_SOURCE_DIR}/src) target_include_directories(${TRGT} INTERFACE ${CMAKE_SOURCE_DIR}/src)
generate_pkgconfig(myx-${TRGT} COMPONENT base-dev INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) 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 add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=base-dev -P