Skip to content

Commit d08786e

Browse files
zerotacgzerotacg
authored
Feature/use cmake alias for qt (#835)
* use alias to get cmake dependencies support
1 parent fd4f5ba commit d08786e

17 files changed

Lines changed: 102 additions & 21 deletions

File tree

‎studio/src/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ ADD_EXECUTABLE(studio WIN32 MACOSX_BUNDLE
4747

4848
TARGET_LINK_LIBRARIES(studio
4949
NeL::misc
50-
${QT_LIBRARIES}
51-
${QT_QTMAIN_LIBRARY})
50+
Qt::Core
51+
Qt::Widgets
52+
)
5253

5354
TARGET_COMPILE_DEFINITIONS(studio PRIVATE QT_NO_KEYWORDS ${QT_DEFINITIONS})
5455
NL_DEFAULT_PROPS(studio "Tools: Studio")

‎studio/src/plugins/bnp_manager/CMakeLists.txt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,14 @@ SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC})
3535

3636
ADD_LIBRARY(studio_plugin_bnp_manager MODULE ${SRC} ${OVQT_PLUG_BNP_MANAGER_MOC_SRC} ${OVQT_EXT_SYS_SRC} ${OVQT_PLUGIN_BNP_MANAGER_RC_SRCS} ${OVQT_PLUG_BNP_MANAGER_UI_HDRS})
3737

38-
TARGET_LINK_LIBRARIES(studio_plugin_bnp_manager studio_plugin_core NeL::misc NeL::georges ${QT_LIBRARIES})
38+
TARGET_LINK_LIBRARIES(studio_plugin_bnp_manager
39+
studio_plugin_core
40+
NeL::misc
41+
NeL::georges
42+
Qt::Core
43+
Qt::Gui
44+
Qt::Widgets
45+
)
3946

4047
NL_DEFAULT_PROPS(studio_plugin_bnp_manager "Tools: Studio Plugin: BNP Manager")
4148
NL_ADD_RUNTIME_FLAGS(studio_plugin_bnp_manager)

‎studio/src/plugins/core/CMakeLists.txt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,14 @@ SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC})
5656

5757
ADD_LIBRARY(studio_plugin_core SHARED ${SRC} ${OVQT_CORE_PLUGIN_MOC_SRC} ${OVQT_EXT_SYS_SRC} ${OVQT_CORE_PLUGIN_RC_SRCS} ${OVQT_CORE_PLUGIN_UI_HDRS})
5858

59-
TARGET_LINK_LIBRARIES(studio_plugin_core NeL::misc NeL::3d ${QT_LIBRARIES})
59+
TARGET_LINK_LIBRARIES(studio_plugin_core
60+
NeL::misc
61+
NeL::3d
62+
Qt::Core
63+
Qt::Gui
64+
Qt::OpenGL
65+
Qt::Widgets
66+
)
6067

6168
NL_DEFAULT_PROPS(studio_plugin_core "Tools: Studio Plugin: Core")
6269
NL_ADD_RUNTIME_FLAGS(studio_plugin_core)

‎studio/src/plugins/disp_sheet_id/CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC})
2727

2828
ADD_LIBRARY(studio_plugin_disp_sheet_id MODULE ${SRC} ${OVQT_DISP_SHEET_ID_PLUGIN_MOC_SRC} ${OVQT_EXT_SYS_SRC} ${OVQT_DISP_SHEET_ID_PLUGIN_UI_HDRS})
2929

30-
TARGET_LINK_LIBRARIES(studio_plugin_disp_sheet_id studio_plugin_core NeL::misc ${QT_LIBRARIES})
30+
TARGET_LINK_LIBRARIES(studio_plugin_disp_sheet_id
31+
studio_plugin_core
32+
NeL::misc
33+
Qt::Core
34+
Qt::Widgets
35+
)
3136

3237
IF(WITH_STLPORT)
3338
TARGET_LINK_LIBRARIES(studio_plugin_disp_sheet_id ${CMAKE_THREAD_LIBS_INIT})

‎studio/src/plugins/example/CMakeLists.txt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,15 @@ SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC})
2929

3030
ADD_LIBRARY(studio_plugin_example MODULE ${SRC} ${OVQT_PLUG_EXAMPLE_MOC_SRC} ${OVQT_EXT_SYS_SRC} ${OVQT_PLUG_EXAMPLE_UI_HDRS})
3131

32-
TARGET_LINK_LIBRARIES(studio_plugin_example studio_plugin_core NeL::misc NeL::3d ${QT_LIBRARIES} ${QT_QTOPENGL_LIBRARY})
32+
TARGET_LINK_LIBRARIES(studio_plugin_example
33+
studio_plugin_core
34+
NeL::misc
35+
NeL::3d
36+
Qt::Core
37+
Qt::Gui
38+
Qt::OpenGL
39+
Qt::Widgets
40+
)
3341

3442
NL_DEFAULT_PROPS(studio_plugin_example "Tools: Studio Plugin: Example")
3543
NL_ADD_RUNTIME_FLAGS(studio_plugin_example)

‎studio/src/plugins/georges_editor/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ TARGET_LINK_LIBRARIES(studio_plugin_georges_editor
5959
NeL::georges
6060
qtpropertybrowser
6161
${QtPropertyBrowser_LIBRARY}
62-
${QT_LIBRARIES}
62+
Qt::Core
63+
Qt::Widgets
6364
LibXml2::LibXml2
6465
)
6566

‎studio/src/plugins/gui_editor/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,9 @@ TARGET_LINK_LIBRARIES(studio_plugin_gui_editor
8787
NeL::misc
8888
NeL::3d
8989
NeL::gui
90-
${QT_LIBRARIES}
91-
${QT_QTOPENGL_LIBRARY}
90+
Qt::Core
91+
Qt::Gui
92+
Qt::Widgets
9293
${QtPropertyBrowser_LIBRARY}
9394
LibXml2::LibXml2
9495
)

‎studio/src/plugins/landscape_editor/CMakeLists.txt‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,16 @@ ADD_LIBRARY(studio_plugin_landscape_editor SHARED ${SRC}
4646
${OVQT_PLUGIN_LANDSCAPE_EDITOR_UI_HDRS}
4747
${OVQT_PLUGIN_LANDSCAPE_EDITOR_RC_SRCS})
4848

49-
TARGET_LINK_LIBRARIES(studio_plugin_landscape_editor studio_plugin_core NeL::misc NeL::3d NeL::georges NeL::ligo ${QT_LIBRARIES} ${QT_QTOPENGL_LIBRARY})
49+
TARGET_LINK_LIBRARIES(studio_plugin_landscape_editor
50+
studio_plugin_core
51+
NeL::misc
52+
NeL::3d
53+
NeL::georges
54+
NeL::ligo
55+
Qt::Core
56+
Qt::OpenGL
57+
Qt::Widgets
58+
)
5059

5160
NL_DEFAULT_PROPS(studio_plugin_landscape_editor "Tools: Studio Plugin: Landscape Editor")
5261
NL_ADD_RUNTIME_FLAGS(studio_plugin_landscape_editor)

‎studio/src/plugins/log/CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC})
2525

2626
ADD_LIBRARY(studio_plugin_log MODULE ${SRC} ${OVQT_PLUG_LOG_MOC_SRC} ${OVQT_EXT_SYS_SRC} ${OVQT_PLUG_LOG_UI_HDRS})
2727

28-
TARGET_LINK_LIBRARIES(studio_plugin_log studio_plugin_core NeL::misc ${QT_LIBRARIES})
28+
TARGET_LINK_LIBRARIES(studio_plugin_log
29+
studio_plugin_core
30+
NeL::misc
31+
Qt::Core
32+
Qt::Widgets
33+
)
2934

3035
NL_DEFAULT_PROPS(studio_plugin_log "Tools: Studio Plugin: Log")
3136
NL_ADD_RUNTIME_FLAGS(studio_plugin_log)

‎studio/src/plugins/mission_compiler/CMakeLists.txt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,15 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/common/src)
3737

3838
ADD_LIBRARY(studio_plugin_mission_compiler MODULE ${SRC} ${OVQT_PLUG_MISSION_COMPILER_MOC_SRC} ${OVQT_PLUG_MISSION_COMPILER_RC_SRCS} ${OVQT_EXT_SYS_SRC} ${OVQT_PLUG_MISSION_COMPILER_UI_HDRS})
3939

40-
TARGET_LINK_LIBRARIES(studio_plugin_mission_compiler studio_plugin_core NeL::misc NeL::ligo ryzom_mission_compiler_lib ${QT_LIBRARIES} ${QT_QTOPENGL_LIBRARY})
40+
TARGET_LINK_LIBRARIES(studio_plugin_mission_compiler
41+
studio_plugin_core
42+
NeL::misc
43+
NeL::ligo
44+
ryzom_mission_compiler_lib
45+
Qt::Core
46+
Qt::Gui
47+
Qt::Widgets
48+
)
4149

4250
NL_DEFAULT_PROPS(studio_plugin_mission_compiler "Tools: Studio Plugin: Mission Compiler")
4351
NL_ADD_RUNTIME_FLAGS(studio_plugin_mission_compiler)

0 commit comments

Comments
 (0)