sdaveb/QJsonModel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to CMakeTools with better package_library_headers function

Browse Source
This commit is contained in:
S David 2024-05-18 03:14:05 -04:00
parent 66b6643f3d
commit 1f55f21589
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMake

@ -1 +1 @@
Subproject commit 3bd6f644028c8a84b5e795aafa69def0cb2f27c0
Subproject commit dd329a0ff68d4ff538bbe7e69a2f6207705f209b

10
CMakeLists.txt
View File

@ -66,12 +66,11 @@ set_target_properties(QJsonModel PROPERTIES
package_library_headers(QJsonModel
GLOB ${QJsonModel_TOP_SOURCE_DIR}/include/*.hpp
${QJsonModel_TOP_SOURCE_DIR}/include/details
${QJsonModel_TOP_SOURCE_DIR}/include
)
target_include_directories(QJsonModel PRIVATE ${QJsonModel_INCLUDE_OUTPUT_DIR}/QJsonModel)
target_include_directories(QJsonModel PUBLIC ${QJsonModel_INCLUDE_OUTPUT_DIR})
target_include_directories(QJsonModel PRIVATE ${QJsonModel_TOP_SOURCE_DIR}/include)
target_include_directories(QJsonModel INTERFACE ${QJsonModel_INCLUDE_OUTPUT_DIR})
# Manually call moc on all header files
file(GLOB_RECURSE QJsonModel_HEADER_FILES
@ -91,7 +90,6 @@ PUBLIC
Qt6::Gui
Qt6::Widgets
)
target_include_directories(QJsonModel PUBLIC ${QJsonModel_PUBLIC_INCLUDE_DIR})
add_library(QJsonModelStatic STATIC)
@ -105,6 +103,8 @@ set_target_properties(QJsonModelShared PROPERTIES OUTPUT_NAME "QJsonModel")
target_link_libraries(QJsonModelStatic PRIVATE QJsonModel)
target_link_libraries(QJsonModelShared PRIVATE QJsonModel)
target_include_directories(QJsonModelStatic INTERFACE ${QJsonModel_INCLUDE_OUTPUT_DIR})
target_include_directories(QJsonModelShared INTERFACE ${QJsonModel_INCLUDE_OUTPUT_DIR})
#target_include_directories(QJsonModelStatic PUBLIC ${QJsonModel_PUBLIC_INCLUDE_DIR})
#target_include_directories(QJsonModelShared PUBLIC ${QJsonModel_PUBLIC_INCLUDE_DIR})