@@ -16,9 +16,9 @@ IF (NOT MSVC)
1616ENDIF (NOT MSVC )
1717
1818IF (WIN32 )
19- ADD_DEFINITIONS (" \" -DHAVE_GETPT -DGRASS_EXPORT=__declspec(dllimport)\" " )
19+ ADD_DEFINITIONS (-DHAVE_GETPT " -DGRASS_EXPORT=__declspec(dllimport)" )
2020ELSE (WIN32 )
21- ADD_DEFINITIONS (" -DHAVE_POSIX_OPENPT -DGRASS_EXPORT=" )
21+ ADD_DEFINITIONS (-DHAVE_POSIX_OPENPT -DGRASS_EXPORT=)
2222ENDIF (WIN32 )
2323
2424########################################################
@@ -35,30 +35,12 @@ SET (GRASS_PLUGIN_SRCS
3535 qgsgrassmapcalc.cpp
3636 qgsgrassmodule.cpp
3737 qgsgrassnewmapset.cpp
38- qgsgrassshell.cpp
3938 qgsgrassattributes.cpp
4039 qgsgrassregion.cpp
4140 qgsgrassutils.cpp
42- qtermwidget/BlockArray.cpp
43- qtermwidget/Emulation.cpp
44- qtermwidget/Filter .cpp
45- qtermwidget/History.cpp
46- qtermwidget/KeyboardTranslator.cpp
47- qtermwidget/Pty.cpp
48- qtermwidget/Screen.cpp
49- qtermwidget/ScreenWindow.cpp
50- qtermwidget/Session.cpp
51- qtermwidget/ShellCommand.cpp
52- qtermwidget/TerminalCharacterDecoder.cpp
53- qtermwidget/TerminalDisplay.cpp
54- qtermwidget/Vt102Emulation.cpp
55- qtermwidget/k3process.cpp
56- qtermwidget/k3processcontroller.cpp
57- qtermwidget/konsole_wcwidth.cpp
58- qtermwidget/kpty.cpp
59- qtermwidget/qtermwidget.cpp
6041)
6142
43+
6244SET (GRASS_PLUGIN_UIS
6345 qgsgrasstoolsbase.ui
6446 qgsgrassselectbase.ui
@@ -81,23 +63,50 @@ SET (GRASS_PLUGIN_MOC_HDRS
8163 qgsgrassmapcalc.h
8264 qgsgrassmodule.h
8365 qgsgrassnewmapset.h
84- qgsgrassshell.h
8566 qgsgrassattributes.h
8667 qgsgrassregion.h
8768 qgsgrassutils.h
8869 qgsgrassedittools.h
89- qtermwidget/Emulation.h
90- qtermwidget/Filter .h
91- qtermwidget/Pty.h
92- qtermwidget/ScreenWindow.h
93- qtermwidget/Session.h
94- qtermwidget/TerminalDisplay.h
95- qtermwidget/Vt102Emulation.h
96- qtermwidget/k3process.h
97- qtermwidget/k3processcontroller.h
98- qtermwidget/qtermwidget.h
9970)
10071
72+ IF (NOT WIN32 )
73+ SET (GRASS_PLUGIN_SRCS ${GRASS_PLUGIN_SRCS}
74+ qgsgrassshell.cpp
75+ qtermwidget/BlockArray.cpp
76+ qtermwidget/Emulation.cpp
77+ qtermwidget/Filter .cpp
78+ qtermwidget/History.cpp
79+ qtermwidget/KeyboardTranslator.cpp
80+ qtermwidget/Pty.cpp
81+ qtermwidget/Screen.cpp
82+ qtermwidget/ScreenWindow.cpp
83+ qtermwidget/Session.cpp
84+ qtermwidget/ShellCommand.cpp
85+ qtermwidget/TerminalCharacterDecoder.cpp
86+ qtermwidget/TerminalDisplay.cpp
87+ qtermwidget/Vt102Emulation.cpp
88+ qtermwidget/k3process.cpp
89+ qtermwidget/k3processcontroller.cpp
90+ qtermwidget/konsole_wcwidth.cpp
91+ qtermwidget/kpty.cpp
92+ qtermwidget/qtermwidget.cpp
93+ )
94+
95+ SET (GRASS_PLUGIN_MOC_HDRS ${GRASS_PLUGIN_MOC_HDRS}
96+ qgsgrassshell.h
97+ qtermwidget/Emulation.h
98+ qtermwidget/Filter .h
99+ qtermwidget/Pty.h
100+ qtermwidget/ScreenWindow.h
101+ qtermwidget/Session.h
102+ qtermwidget/TerminalDisplay.h
103+ qtermwidget/Vt102Emulation.h
104+ qtermwidget/k3process.h
105+ qtermwidget/k3processcontroller.h
106+ qtermwidget/qtermwidget.h
107+ )
108+ ENDIF (NOT WIN32 )
109+
101110SET (GRASS_PLUGIN_RCCS qgsgrass_plugin.qrc)
102111
103112
@@ -143,7 +152,6 @@ TARGET_LINK_LIBRARIES(grassplugin
143152 qgis_gui
144153 qgisgrass
145154 ${QT_QTSQL_LIBRARY}
146- ${QT_QT3SUPPORT_LIBRARY}
147155 ${GRASS_LIBRARIES}
148156)
149157
0 commit comments