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

Compare commits

base: f1x1t:20fa2ff52b564d8a2b53705378ca1ea968633393
Branches Tags
f1x1t:master
...
compare: f1x1t:92a8ede405fe544c15290b7f4085e0d586adf27b
Branches Tags
f1x1t:master

2 Commits
20fa2ff52b ... 92a8ede405

Author SHA1 Message Date
Andrey Astafyev
92a8ede405 Обновление подмодулей 2020-04-15 10:39:58 +03:00
Andrey Astafyev
2ddb4a4386 Revert "Исправлено подключение заголовочных файлов" 
This reverts commit 20fa2ff52b.
 2020-04-15 10:39:49 +03:00
2 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

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 d5729fa806b0b664bbe066721612235b6bc8d3da