Continue work on SRD_OUTPUT_LOGIC

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c77435d462c37ba352e9482aa3e799d4668b4b34..add9c02f9923464ba02ed981022b49c899ad8b0f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,9 +21,9 @@
 
 cmake_minimum_required(VERSION 2.8.12)
 
-include(GNUInstallDirs)
+project(pulseview C CXX)
 
-project(pulseview)
+include(GNUInstallDirs)
 
 # Let AUTOMOC and AUTOUIC process GENERATED files.
 if(POLICY CMP0071)
@@ -247,6 +247,7 @@ set(pulseview_SOURCES
        pv/globalsettings.cpp
        pv/logging.cpp
        pv/mainwindow.cpp
+       pv/metadata_obj.cpp
        pv/session.cpp
        pv/storesession.cpp
        pv/util.cpp
@@ -257,6 +258,7 @@ set(pulseview_SOURCES
        pv/data/analogsegment.cpp
        pv/data/logic.cpp
        pv/data/logicsegment.cpp
+       pv/data/mathsignal.cpp
        pv/data/signalbase.cpp
        pv/data/signaldata.cpp
        pv/data/segment.cpp
@@ -284,6 +286,7 @@ set(pulseview_SOURCES
        pv/views/trace/cursorpair.cpp
        pv/views/trace/flag.cpp
        pv/views/trace/header.cpp
+       pv/views/trace/mathsignal.cpp
        pv/views/trace/marginwidget.cpp
        pv/views/trace/logicsignal.cpp
        pv/views/trace/ruler.cpp
@@ -319,9 +322,11 @@ set(pulseview_SOURCES
 
 # This list includes only QObject derived class headers.
 set(pulseview_HEADERS
+       pv/exprtk.hpp
        pv/logging.hpp
        pv/globalsettings.hpp
        pv/mainwindow.hpp
+       pv/metadata_obj.hpp
        pv/session.hpp
        pv/storesession.hpp
        pv/binding/device.hpp
@@ -329,6 +334,7 @@ set(pulseview_HEADERS
        pv/data/analogsegment.hpp
        pv/data/logic.hpp
        pv/data/logicsegment.hpp
+       pv/data/mathsignal.hpp
        pv/data/signalbase.hpp
        pv/dialogs/connect.hpp
        pv/dialogs/inputoutputoptions.hpp
@@ -349,6 +355,7 @@ set(pulseview_HEADERS
        pv/views/trace/flag.hpp
        pv/views/trace/header.hpp
        pv/views/trace/logicsignal.hpp
+       pv/views/trace/mathsignal.hpp
        pv/views/trace/marginwidget.hpp
        pv/views/trace/ruler.hpp
        pv/views/trace/signal.hpp
@@ -458,6 +465,9 @@ add_definitions(-D__STDC_LIMIT_MACROS)
 add_definitions(-Wall -Wextra)
 add_definitions(-std=c++11)
 add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1)
+if(WIN32)
+       add_definitions(-Wa,-mbig-obj -O3)
+endif()
 
 if(ENABLE_FLOW)
        add_definitions(-DENABLE_FLOW)