tempo-plotter Changeset - e423f1347315 · protofusion repositories

Changeset - e423f1347315

Parent rev.

Child rev.

[Not reviewed]

Merge channelmanager

0 2 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-12-31 14:47:48
hy@ozderya.net

Merge with default

2 files changed with 3 insertions and 1 deletions:

CMakeLists.txt

cmake/modules/BuildQwt.cmake

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -121,13 +121,13 @@ add_executable(${PROGRAM_NAME} WIN32 @@
   ${UI_FILES}
   ${RES_FILES}
+  )
 # Use the Widgets module from Qt 5.
 target_link_libraries(${PROGRAM_NAME} ${QWT_LIBRARY})
-qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort Svg)
 qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort)
 if (BUILD_QWT)
   add_dependencies(${PROGRAM_NAME} QWT)
 endif (BUILD_QWT)
 # set compiler flags

cmake/modules/BuildQwt.cmake

➞

Show inline comments

@@ @@ -22,12 +22,14 @@ include(ExternalProject) @@
 ExternalProject_Add(QWT
   PREFIX qwt
   SVN_REPOSITORY svn://svn.code.sf.net/p/qwt/code/branches/qwt-6.1
   # disable QwtDesigner plugin and enable static build
   PATCH_COMMAND sed -i -r -e "s/QWT_CONFIG\\s*\\+=\\s*QwtDesigner/#&/"
                           -e "s/QWT_CONFIG\\s*\\+=\\s*QwtDll/#&/"
                           -e "s/QWT_CONFIG\\s*\\+=\\s*QwtSvg/#&/"
                           -e "s/QWT_CONFIG\\s*\\+=\\s*QwtOpenGL/#&/"
 						  -e "s|QWT_INSTALL_PREFIX\\s*=.*|QWT_INSTALL_PREFIX = <INSTALL_DIR>|"
 							 <SOURCE_DIR>/qwtconfig.pri
   CONFIGURE_COMMAND qmake <SOURCE_DIR>/qwt.pro
+  )
 ExternalProject_Get_Property(QWT install_dir)

0 comments (0 inline, 0 general)