File tree Expand file tree Collapse file tree 3 files changed +9
-11
lines changed
Expand file tree Collapse file tree 3 files changed +9
-11
lines changed Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ target_include_directories(OMPlotLib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
3636
3737target_link_libraries (OMPlotLib PUBLIC Qt5::Widgets)
3838target_link_libraries (OMPlotLib PUBLIC Qt5::PrintSupport)
39- target_link_libraries (OMPlotLib PUBLIC qwt )
39+ target_link_libraries (OMPlotLib PUBLIC omqwt )
4040target_link_libraries (OMPlotLib PUBLIC omc::simrt::runtime)
4141
4242
Original file line number Diff line number Diff line change 22# qwt 6.1.5 and OpenModelica
33
44cmake_minimum_required (VERSION 3.14)
5- project (qwt VERSION 6.1.5 LANGUAGES CXX)
5+ project (omqwt VERSION 6.1.5 LANGUAGES CXX)
66
77option (QWT_WITH_PLOT "Whether to build plot" ON )
88option (QWT_WITH_SVG "Whether to build svg" ON )
Original file line number Diff line number Diff line change @@ -214,22 +214,22 @@ if (QWT_WITH_WIDGETS)
214214 qwt_wheel.cpp)
215215endif ()
216216
217- add_library (qwt SHARED ${QWT_HEADERS} ${QWT_SOURCES} )
217+ add_library (omqwt STATIC ${QWT_HEADERS} ${QWT_SOURCES} )
218218
219- target_compile_definitions (qwt
219+ target_compile_definitions (omqwt
220220 PUBLIC
221221 $<$<BOOL :MSVC >:QWT_DLL>
222222 PRIVATE
223223 $<$<BOOL :MSVC >:QWT_MAKEDLL>
224224)
225225
226- target_include_directories (qwt
226+ target_include_directories (omqwt
227227 PUBLIC
228228 $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR} /src>
229229 $<INSTALL_INTERFACE:include >)
230230
231231if (USE_QT6)
232- target_link_libraries (qwt
232+ target_link_libraries (omqwt
233233 PUBLIC
234234 Qt6::Core
235235 Qt6::OpenGL
@@ -239,7 +239,7 @@ if (USE_QT6)
239239 Qt6::PrintSupport
240240 Qt6::Svg)
241241else ()
242- target_link_libraries (qwt
242+ target_link_libraries (omqwt
243243 PUBLIC
244244 Qt5::Core
245245 Qt5::OpenGL
@@ -249,10 +249,8 @@ else ()
249249 Qt5::Svg)
250250endif ()
251251
252- set_target_properties (qwt PROPERTIES
252+ set_target_properties (omqwt PROPERTIES
253253 VERSION ${QWT_VERSION}
254254 SOVERSION ${QWT_VER_MAJ}
255255 AUTOMOC ON )
256- target_compile_definitions (qwt PRIVATE QWT_MOC_INCLUDE)
257-
258- install (TARGETS qwt)
256+ target_compile_definitions (omqwt PRIVATE QWT_MOC_INCLUDE)
You can’t perform that action at this time.
0 commit comments