X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=a5a910456e8b5c053b92bd10da576dd78fde247e;hb=7ba41e7ec7e575ae34ed2af33920c6e843aaac4d;hp=d835927ebb504a0696d07b5a0b84b5f49fa1015d;hpb=c23b29d67ed68c1a899000bf0049056fe9f51a62;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d835927..a5a9104 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,10 +18,14 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.6)
+
 include(FindPkgConfig)
 include(GNUInstallDirs)
 
+set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
+include(cotire)
+
 project(pulseview)
 
 #===============================================================================
@@ -62,6 +66,7 @@ endif()
 find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
 
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
 find_package(Qt4 REQUIRED)
 
 # Find the platform's thread library (needed for boost-thread).
@@ -132,10 +137,12 @@ set(pulseview_SOURCES
 	pv/view/selectableitem.cpp
 	pv/view/signal.cpp
 	pv/view/timemarker.cpp
+	pv/view/trace.cpp
 	pv/view/view.cpp
 	pv/view/viewport.cpp
 )
 
+# This list includes only QObject derrived class headers
 set(pulseview_HEADERS
 	pv/mainwindow.h
 	pv/sigsession.h
@@ -146,11 +153,13 @@ set(pulseview_HEADERS
 	pv/toolbars/samplingbar.h
 	pv/view/cursor.h
 	pv/view/header.h
+	pv/view/logicsignal.h
 	pv/view/marginwidget.h
 	pv/view/ruler.h
 	pv/view/selectableitem.h
 	pv/view/signal.h
 	pv/view/timemarker.h
+	pv/view/trace.h
 	pv/view/view.h
 	pv/view/viewport.h
 )
@@ -233,6 +242,7 @@ add_executable(${PROJECT_NAME}
 )
 
 target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
+cotire(${PROJECT_NAME})
 
 if(WIN32)
 # Pass -mwindows so that no "DOS box" will open when PulseView is started.