tempo-plotter Changeset - 924a21591dac · protofusion repositories

Changeset - 924a21591dac

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 2 1

Hasan Yavuz ÖZDERYA - 8 years ago 2017-04-17 01:49:15
hy@ozderya.net

Merge

3 files changed with 60 insertions and 10 deletions:

CMakeLists.txt

cmake/modules/BuildQColorWidgets.cmake

cmake/modules/FindQtColorWidgets.cmake

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -45,32 +45,39 @@ set(QWT_STATIC_INCLUDE "" CACHE PATH "Pa @@
 if (BUILD_QWT)
   include(BuildQwt)
 else (BUILD_QWT)
   if (QWT_USE_STATIC)
 	set(QWT_LIBRARY ${QWT_STATIC_LIBRARY})
 	set(QWT_INCLUDE_DIR ${QWT_STATIC_INCLUDE})
   else (QWT_USE_STATIC)
 	find_package(Qwt 6.1 REQUIRED)
   endif (QWT_USE_STATIC)
 endif (BUILD_QWT)
 include(BuildQColorWidgets)
 set(BUILD_QTCOLORWIDGETS true CACHE BOOL "Download and build QtColorWidgets library automatically.")
 if (BUILD_QTCOLORWIDGETS)
   include(BuildQColorWidgets)
 else ()
   find_package(QtColorWidgets REQUIRED)
 endif ()
 # includes
 include_directories("./src" ${QWT_INCLUDE_DIR} ${QCW_INCLUDE_DIR})
 include_directories("./src"
   ${QWT_INCLUDE_DIR}
   ${QTCOLORWIDGETS_INCLUDE_DIRS}
+  )
 # flags
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QCW_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QTCOLORWIDGETS_FLAGS}")
 # wrap UI and resource files
 qt5_wrap_ui(UI_FILES
   src/mainwindow.ui
   src/portcontrol.ui
   src/about_dialog.ui
   src/snapshotview.ui
   src/commandpanel.ui
   src/commandwidget.ui
   src/dataformatpanel.ui
   src/plotcontrolpanel.ui
   src/recordpanel.ui
@@ @@ -124,32 +131,38 @@ add_executable(${PROGRAM_NAME} WIN32 @@
   src/asciireader.cpp
   src/asciireadersettings.cpp
   src/demoreader.cpp
   src/framedreader.cpp
   src/framedreadersettings.cpp
   src/plotmanager.cpp
   src/numberformat.cpp
   misc/windows_icon.rc
   ${UI_FILES}
   ${RES_FILES}
+  )
 add_dependencies(${PROGRAM_NAME} QCW)
 # Use the Widgets module from Qt 5.
 target_link_libraries(${PROGRAM_NAME} ${QWT_LIBRARY} ${QCW_LIBRARY})
 target_link_libraries(${PROGRAM_NAME}
   ${QWT_LIBRARY}
   ${QTCOLORWIDGETS_LIBRARIES}
+  )
 qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort)
 if (BUILD_QWT)
   add_dependencies(${PROGRAM_NAME} QWT)
 endif (BUILD_QWT)
 endif ()
 if (BUILD_QTCOLORWIDGETS)
   add_dependencies(${PROGRAM_NAME} QCW)
 endif ()
 # set compiler flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 # Enable C++11 support, fail if not supported
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
 CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
 if(COMPILER_SUPPORTS_CXX11)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 elseif(COMPILER_SUPPORTS_CXX0X)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")

cmake/modules/BuildQColorWidgets.cmake

➞

Show inline comments

@@ @@ -19,15 +19,18 @@ @@
 include(ExternalProject)
 ExternalProject_Add(QCW
   PREFIX qcw
   GIT_REPOSITORY https://github.com/mbasaglia/Qt-Color-Widgets
   PATCH_COMMAND patch -t -p1 -i ${CMAKE_CURRENT_LIST_DIR}/qt_5_2_moc_creation_namespace_fix.diff
   CMAKE_CACHE_ARGS "-DCMAKE_CXX_FLAGS:string=-D QTCOLORWIDGETS_STATICALLY_LINKED"
   UPDATE_COMMAND ""
   INSTALL_COMMAND "")
 ExternalProject_Get_Property(QCW binary_dir source_dir)
 set(QCW_FLAGS "-D QTCOLORWIDGETS_STATICALLY_LINKED")
 set(QCW_LIBRARY ${binary_dir}/libColorWidgets-qt5.a)
 set(QCW_INCLUDE_DIR ${source_dir}/include)
 set(QTCOLORWIDGETS_FLAGS "-D QTCOLORWIDGETS_STATICALLY_LINKED")
 set(QTCOLORWIDGETS_LIBRARY ${binary_dir}/libColorWidgets-qt5.a)
 set(QTCOLORWIDGETS_INCLUDE_DIR ${source_dir}/include)
 set(QTCOLORWIDGETS_LIBRARIES ${QTCOLORWIDGETS_LIBRARY})
 set(QTCOLORWIDGETS_INCLUDE_DIRS ${QTCOLORWIDGETS_INCLUDE_DIR})

cmake/modules/FindQtColorWidgets.cmake

➞

Show inline comments

@@ new file 100644 @@
+#
 # Copyright © 2017 Hasan Yavuz Özderya
+#
 # This file is part of serialplot.
+#
 # serialplot is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # serialplot is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
+#
 # Note: this script is intended for the debian package created for serialplot.
 find_library(QTCOLORWIDGETS_LIBRARY "libColorWidgets-qt5.a")
 find_path(QTCOLORWIDGETS_INCLUDE_DIR "color_preview.hpp" PATHS "/usr/include/qtcolorwidgets/" NO_DEFAULT_PATH)
 mark_as_advanced(QTCOLORWIDGETS_LIBRARY QTCOLORWIDGETS_INCLUDE_DIR)
 find_package_handle_standard_args(QtColorWidgets DEFAULT_MSG QTCOLORWIDGETS_LIBRARY QTCOLORWIDGETS_INCLUDE_DIR)
 if (QTCOLORWIDGETS_FOUND)
   set(QTCOLORWIDGETS_FLAGS "-D QTCOLORWIDGETS_STATICALLY_LINKED")
   mark_as_advanced(QTCOLORWIDGETS_FLAGS)
   set(QTCOLORWIDGETS_LIBRARIES ${QTCOLORWIDGETS_LIBRARY})
   set(QTCOLORWIDGETS_INCLUDE_DIRS ${QTCOLORWIDGETS_INCLUDE_DIR})
 endif (QTCOLORWIDGETS_FOUND)

0 comments (0 inline, 0 general)