Skip to content

Commit 50c4a8e

Browse files
authored
Update CMakeLists.txt (#204)
Pass header files to add_library() so they appear in the 'qtadvanceddocking' Visual Studio project. Add path to header files in PUBLIC include build interface so the 'qtadvanceddocking' target can be built in-source in a CMake project.
1 parent 59d6a64 commit 50c4a8e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ set(ads_SRCS
2525
DockComponentsFactory.cpp
2626
ads.qrc
2727
)
28-
set(ads_INSTALL_INCLUDE
28+
set(ads_HEADERS
2929
ads_globals.h
3030
DockAreaTabBar.h
3131
DockAreaTitleBar.h
@@ -47,13 +47,13 @@ set(ads_INSTALL_INCLUDE
4747
)
4848
if (UNIX)
4949
set(ads_SRCS linux/FloatingWidgetTitleBar.cpp ${ads_SRCS})
50-
set(ads_INSTALL_INCLUDE linux/FloatingWidgetTitleBar.h ${ads_INSTALL_INCLUDE})
50+
set(ads_HEADERS linux/FloatingWidgetTitleBar.h ${ads_HEADERS})
5151
endif()
5252
if(BUILD_STATIC)
53-
add_library(qtadvanceddocking STATIC ${ads_SRCS})
53+
add_library(qtadvanceddocking STATIC ${ads_SRCS} ${ads_HEADERS})
5454
target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC)
5555
else()
56-
add_library(qtadvanceddocking SHARED ${ads_SRCS})
56+
add_library(qtadvanceddocking SHARED ${ads_SRCS} ${ads_HEADERS})
5757
target_compile_definitions(qtadvanceddocking PRIVATE ADS_SHARED_EXPORT)
5858
endif()
5959
target_link_libraries(qtadvanceddocking PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets)
@@ -75,7 +75,7 @@ write_basic_package_version_file(
7575
VERSION ${VERSION_SHORT}
7676
COMPATIBILITY SameMajorVersion
7777
)
78-
install(FILES ${ads_INSTALL_INCLUDE}
78+
install(FILES ${ads_HEADERS}
7979
DESTINATION include
8080
COMPONENT headers
8181
)
@@ -104,5 +104,5 @@ install(FILES qtadvanceddockingConfig.cmake "${CMAKE_CURRENT_BINARY_DIR}/qtadvan
104104

105105
target_include_directories(qtadvanceddocking PUBLIC
106106
$<INSTALL_INTERFACE:include>
107+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
107108
)
108-

0 commit comments

Comments
 (0)