f1x1t/cmlib-example-app-qt5-gui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Исправлено подключение заголовочных файлов"

Browse Source 
This reverts commit 20fa2ff52b.
This commit is contained in:
Andrei Astafev 2020-04-15 10:39:49 +03:00
parent 20fa2ff52b
commit 2ddb4a4386
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/cmlib

@ -1 +1 @@
Subproject commit 0b69005b7a05760d538c0902e634848b62f3cda1
Subproject commit 3c0fd214b9ad8bd9306aba18b37d7078319654b1

2
cmake/doc

@ -1 +1 @@
Subproject commit acdfb6a9dd5ca1cb037e541f7da7033968873357
Subproject commit 81fe90131c2d93d5d3e0f3b48c38fad0418fb953

8
src/cmlib-example/CMakeLists.txt
View File

@ -60,15 +60,15 @@ add_executable(${TRGT} ${TRGT_ui_h} ${TRGT_moc_cpp} ${TRGT_qrc_cpp} ${TRGT_cpp})
common_target_properties(${TRGT})
# Qt5: подключение заголовочных файлов
target_include_directories(${TRGT} PUBLIC ${Qt5Core_INCLUDE_DIRS})
target_include_directories(${TRGT} PUBLIC ${Qt5Gui_INCLUDE_DIRS})
target_include_directories(${TRGT} PUBLIC ${Qt5Widgets_INCLUDE_DIRS})
target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Gui_INCLUDE_DIRS})
target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Widgets_INCLUDE_DIRS})
# Qt5: подключение библиотек
target_link_libraries(${TRGT} Qt5::Core Qt5::Gui Qt5::Widgets)
# Добавление к пути поиска заголовочных файлов
target_include_directories(${TRGT} PUBLIC ${Boost_INCLUDE_DIRS})
target_include_directories(${TRGT} SYSTEM PUBLIC ${Boost_INCLUDE_DIRS})
# Зависимость от библиотеки из внешнего проекта проекта
add_dependencies(${TRGT} myxlib)

2
thirdparty/myxlib vendored

@ -1 +1 @@
Subproject commit 576bafd70b6548ad9fc8e336d1743da5502bc059
Subproject commit bea1da9c1517c18163ea67bb30ea9308fb1397da