Skip to content

Commit 08b0f8a

Browse files
n-elien-elie
authored
Change targets name based on Qt version (#489)
1 parent 54c2bd0 commit 08b0f8a

File tree

10 files changed

+32
-27
lines changed

10 files changed

+32
-27
lines changed

‎demo/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ target_link_libraries(AdvancedDockingSystemDemo PUBLIC Qt${QT_VERSION_MAJOR}::Co
2525
if(WIN32 AND QT_VERSION_MAJOR LESS 6)
2626
target_link_libraries(AdvancedDockingSystemDemo PUBLIC Qt${QT_VERSION_MAJOR}::AxContainer)
2727
endif()
28-
target_link_libraries(AdvancedDockingSystemDemo PRIVATE qtadvanceddocking)
28+
target_link_libraries(AdvancedDockingSystemDemo PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
2929
set_target_properties(AdvancedDockingSystemDemo PROPERTIES
3030
AUTOMOC ON
3131
AUTORCC ON

‎examples/autohide/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ add_executable(AutoHideExample WIN32
99
mainwindow.ui
1010
)
1111
target_include_directories(AutoHideExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
12-
target_link_libraries(AutoHideExample PRIVATE qtadvanceddocking)
12+
target_link_libraries(AutoHideExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
1313
target_link_libraries(AutoHideExample PUBLIC Qt${QT_VERSION_MAJOR}::Core
1414
Qt${QT_VERSION_MAJOR}::Gui
1515
Qt${QT_VERSION_MAJOR}::Widgets)

‎examples/centralwidget/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ add_executable(CentralWidgetExample WIN32
99
mainwindow.ui
1010
)
1111
target_include_directories(CentralWidgetExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
12-
target_link_libraries(CentralWidgetExample PRIVATE qtadvanceddocking)
12+
target_link_libraries(CentralWidgetExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
1313
target_link_libraries(CentralWidgetExample PUBLIC Qt${QT_VERSION_MAJOR}::Core
1414
Qt${QT_VERSION_MAJOR}::Gui
1515
Qt${QT_VERSION_MAJOR}::Widgets)

‎examples/deleteonclose/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ add_executable(DeleteOnCloseTest WIN32
77
main.cpp
88
)
99
target_include_directories(DeleteOnCloseTest PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
10-
target_link_libraries(DeleteOnCloseTest PRIVATE qtadvanceddocking)
10+
target_link_libraries(DeleteOnCloseTest PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
1111
target_link_libraries(DeleteOnCloseTest PUBLIC Qt${QT_VERSION_MAJOR}::Core
1212
Qt${QT_VERSION_MAJOR}::Gui
1313
Qt${QT_VERSION_MAJOR}::Widgets)

‎examples/dockindock/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ add_executable(DockInDockExample WIN32
1212
mainframe.cpp
1313
)
1414
target_include_directories(DockInDockExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
15-
target_link_libraries(DockInDockExample PRIVATE qtadvanceddocking)
15+
target_link_libraries(DockInDockExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
1616
target_link_libraries(DockInDockExample PUBLIC Qt${QT_VERSION_MAJOR}::Core
1717
Qt${QT_VERSION_MAJOR}::Gui
1818
Qt${QT_VERSION_MAJOR}::Widgets)

‎examples/emptydockarea/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ add_executable(EmptyDockAreaExample WIN32
99
mainwindow.ui
1010
)
1111
target_include_directories(EmptyDockAreaExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
12-
target_link_libraries(EmptyDockAreaExample PRIVATE qtadvanceddocking)
12+
target_link_libraries(EmptyDockAreaExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
1313
target_link_libraries(EmptyDockAreaExample PUBLIC Qt${QT_VERSION_MAJOR}::Core
1414
Qt${QT_VERSION_MAJOR}::Gui
1515
Qt${QT_VERSION_MAJOR}::Widgets)

‎examples/hideshow/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ add_executable(HideShowExample WIN32
99
MainWindow.ui
1010
)
1111
target_include_directories(HideShowExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
12-
target_link_libraries(HideShowExample PRIVATE qtadvanceddocking)
12+
target_link_libraries(HideShowExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
1313
target_link_libraries(HideShowExample PUBLIC Qt${QT_VERSION_MAJOR}::Core
1414
Qt${QT_VERSION_MAJOR}::Gui
1515
Qt${QT_VERSION_MAJOR}::Widgets)

‎examples/sidebar/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ add_executable(SidebarExample WIN32
99
MainWindow.ui
1010
)
1111
target_include_directories(SidebarExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
12-
target_link_libraries(SidebarExample PRIVATE qtadvanceddocking)
12+
target_link_libraries(SidebarExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
1313
target_link_libraries(SidebarExample PUBLIC Qt${QT_VERSION_MAJOR}::Core
1414
Qt${QT_VERSION_MAJOR}::Gui
1515
Qt${QT_VERSION_MAJOR}::Widgets)

‎examples/simple/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ add_executable(SimpleExample WIN32
99
MainWindow.ui
1010
)
1111
target_include_directories(SimpleExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
12-
target_link_libraries(SimpleExample PRIVATE qtadvanceddocking)
12+
target_link_libraries(SimpleExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
1313
target_link_libraries(SimpleExample PUBLIC Qt${QT_VERSION_MAJOR}::Core
1414
Qt${QT_VERSION_MAJOR}::Gui
1515
Qt${QT_VERSION_MAJOR}::Widgets)

‎src/CMakeLists.txt‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -64,50 +64,52 @@ if (UNIX AND NOT APPLE)
6464
set(ads_SRCS linux/FloatingWidgetTitleBar.cpp ${ads_SRCS})
6565
set(ads_HEADERS linux/FloatingWidgetTitleBar.h ${ads_HEADERS})
6666
endif()
67+
68+
set(library_name "qt${QT_VERSION_MAJOR}advanceddocking")
6769
if(BUILD_STATIC)
68-
add_library(qtadvanceddocking STATIC ${ads_SRCS} ${ads_HEADERS})
69-
target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC)
70+
add_library(${library_name} STATIC ${ads_SRCS} ${ads_HEADERS})
71+
target_compile_definitions( ${library_name} PUBLIC ADS_STATIC)
7072
else()
71-
add_library(qtadvanceddocking SHARED ${ads_SRCS} ${ads_HEADERS})
72-
target_compile_definitions(qtadvanceddocking PRIVATE ADS_SHARED_EXPORT)
73+
add_library( ${library_name} SHARED ${ads_SRCS} ${ads_HEADERS})
74+
target_compile_definitions( ${library_name} PRIVATE ADS_SHARED_EXPORT)
7375
endif()
7476

75-
add_library(ads::qtadvanceddocking ALIAS qtadvanceddocking)
77+
add_library(ads::${library_name} ALIAS ${library_name})
7678

77-
target_link_libraries(qtadvanceddocking PUBLIC Qt${QT_VERSION_MAJOR}::Core
79+
target_link_libraries(${library_name} PUBLIC Qt${QT_VERSION_MAJOR}::Core
7880
Qt${QT_VERSION_MAJOR}::Gui
7981
Qt${QT_VERSION_MAJOR}::Widgets)
8082
if (UNIX AND NOT APPLE)
81-
target_link_libraries(qtadvanceddocking PUBLIC xcb)
83+
target_link_libraries(${library_name} PUBLIC xcb)
8284
endif()
83-
set_target_properties(qtadvanceddocking PROPERTIES
85+
set_target_properties(${library_name} PROPERTIES
8486
AUTOMOC ON
8587
AUTORCC ON
8688
CXX_EXTENSIONS OFF
8789
VERSION ${VERSION_SHORT}
88-
EXPORT_NAME "qtadvanceddocking"
90+
EXPORT_NAME ${library_name}
8991
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
9092
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
9193
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin"
9294
)
9395
if(QT_VERSION_MAJOR STREQUAL "5")
94-
set_target_properties(qtadvanceddocking PROPERTIES
96+
set_target_properties(${library_name} PROPERTIES
9597
CXX_STANDARD 14
9698
CXX_STANDARD_REQUIRED ON)
9799
elseif(QT_VERSION_MAJOR STREQUAL "6")
98-
set_target_properties(qtadvanceddocking PROPERTIES
100+
set_target_properties(${library_name} PROPERTIES
99101
CXX_STANDARD 17
100102
CXX_STANDARD_REQUIRED ON)
101103
endif()
102104

103105
include(CMakePackageConfigHelpers)
104106
write_basic_package_version_file(
105-
"qtadvanceddockingConfigVersion.cmake"
107+
"${library_name}ConfigVersion.cmake"
106108
VERSION ${VERSION_SHORT}
107109
COMPATIBILITY SameMajorVersion
108110
)
109111
install(FILES ${ads_HEADERS}
110-
DESTINATION include
112+
DESTINATION include/${library_name}
111113
COMPONENT headers
112114
)
113115
install(FILES
@@ -116,7 +118,7 @@ install(FILES
116118
DESTINATION license/ads
117119
COMPONENT license
118120
)
119-
install(TARGETS qtadvanceddocking
121+
install(TARGETS ${library_name}
120122
EXPORT adsTargets
121123
RUNTIME DESTINATION bin
122124
LIBRARY DESTINATION lib
@@ -127,13 +129,16 @@ install(TARGETS qtadvanceddocking
127129
install(EXPORT adsTargets
128130
FILE adsTargets.cmake
129131
NAMESPACE ads::
130-
DESTINATION lib/cmake/qtadvanceddocking
132+
DESTINATION lib/cmake/${library_name}
133+
)
134+
install(FILES qtadvanceddockingConfig.cmake RENAME ${library_name}Config.cmake
135+
DESTINATION lib/cmake/${library_name}
131136
)
132-
install(FILES qtadvanceddockingConfig.cmake "${CMAKE_CURRENT_BINARY_DIR}/qtadvanceddockingConfigVersion.cmake"
133-
DESTINATION lib/cmake/qtadvanceddocking
137+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${library_name}ConfigVersion.cmake"
138+
DESTINATION lib/cmake/${library_name}
134139
)
135140

136-
target_include_directories(qtadvanceddocking PUBLIC
141+
target_include_directories(${library_name} PUBLIC
137142
$<INSTALL_INTERFACE:include>
138143
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
139144
)

0 commit comments

Comments
 (0)