Set explicit BOOST_ROOT on Windows/MinGW.

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5818694aac85a4539e4b5230abca85075af8389..afbe0df89afcb2aa311bf823b6bc302fdeb23cec 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,9 +6,14 @@ project(pulseview)
 find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED
        libsigrokdecode>=0.1.0
-       libsigrok>=0.1.0
+       libsigrok>=0.2.0
 )
 
+# On Windows/MinGW we explicitly point cmake to the Boost directory.
+if(WIN32)
+set(BOOST_ROOT /usr/local)
+endif(WIN32)
+
 find_package(Qt4 REQUIRED)
 find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
 
@@ -27,6 +32,7 @@ set(pulseview_SOURCES
        sigsession.cpp
        signal.cpp
        pv/view/header.cpp
+       pv/view/ruler.cpp
        pv/view/view.cpp
        pv/view/viewport.cpp
 )
@@ -37,6 +43,7 @@ set(pulseview_HEADERS
        samplingbar.h
        sigsession.h
        pv/view/header.h
+       pv/view/ruler.h
        pv/view/view.h
        pv/view/viewport.h
 )
@@ -56,8 +63,6 @@ set(pulseview_TEST_SOURCES
        logicdatasnapshot.cpp
 )
 
-set(QT_USE_QTOPENGL TRUE)
-
 qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
 qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
 qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
@@ -67,16 +72,33 @@ include(${QT_USE_FILE})
 add_definitions(${QT_DEFINITIONS})
 add_definitions(-DAPP_VERSION="${VERSION}")
 
+# On Windows/MinGW we need PKGDEPS_STATIC_INCLUDE_DIRS.
+if(WIN32)
+include_directories(
+       ${include_directories}
+       ${Boost_INCLUDE_DIRS}
+       ${PKGDEPS_STATIC_INCLUDE_DIRS}
+)
+else(WIN32)
 include_directories(
        ${include_directories}
        ${Boost_INCLUDE_DIRS}
        ${PKGDEPS_INCLUDE_DIRS}
 )
+endif(WIN32)
 
+# On Windows/MinGW we need PKGDEPS_STATIC_LIBRARY_DIRS.
+if(WIN32)
+link_directories(
+       ${Boost_LIBRARY_DIRS}
+       ${PKGDEPS_STATIC_LIBRARY_DIRS}
+)
+else(WIN32)
 link_directories(
        ${Boost_LIBRARY_DIRS}
        ${PKGDEPS_LIBRARY_DIRS}
 )
+endif(WIN32)
 
 add_executable(pulseview
        ${pulseview_SOURCES}
@@ -85,11 +107,20 @@ add_executable(pulseview
        ${pulseview_RESOURCES_RCC}
 )
 
+# On Windows/MinGW we need PKGDEPS_STATIC_LIBRARIES.
+if(WIN32)
+target_link_libraries(pulseview
+       ${Boost_LIBRARIES}
+       ${PKGDEPS_STATIC_LIBRARIES}
+       ${QT_LIBRARIES}
+)
+else(WIN32)
 target_link_libraries(pulseview
        ${Boost_LIBRARIES}
        ${PKGDEPS_LIBRARIES}
        ${QT_LIBRARIES}
 )
+endif(WIN32)
 
 add_definitions(-DBOOST_TEST_DYN_LINK)
 
@@ -97,11 +128,20 @@ add_executable(pulseview-test
        ${pulseview_TEST_SOURCES}
 )
 
+# On Windows/MinGW we need PKGDEPS_STATIC_LIBRARIES.
+if(WIN32)
+target_link_libraries(pulseview-test
+       ${Boost_LIBRARIES}
+       ${PKGDEPS_STATIC_LIBRARIES}
+       ${QT_LIBRARIES}
+)
+else(WIN32)
 target_link_libraries(pulseview-test
        ${Boost_LIBRARIES}
        ${PKGDEPS_LIBRARIES}
        ${QT_LIBRARIES}
 )
+endif(WIN32)
 
 enable_testing()
 add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test)