Moved install rule out of test section in CMakeLists.txt

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ed74e444af5e5284b767753f75bb897ebfde534..41e623186e42e1f085f019a34c05a4be16ecc611 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,22 @@
+##
+## This file is part of the PulseView project.
+##
+## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+##
+## This program 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 2 of the License, or
+## (at your option) any later version.
+##
+## This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+##
+
 cmake_minimum_required(VERSION 2.6)
 include(FindPkgConfig)
 
@@ -9,23 +28,28 @@ pkg_check_modules(PKGDEPS REQUIRED
        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)
 
 set(VERSION 0.1.0)
 
 set(pulseview_SOURCES
-       about.cpp
-       datasnapshot.cpp
-       logicdata.cpp
-       logicdatasnapshot.cpp
-       logicsignal.cpp
        main.cpp
-       mainwindow.cpp
-       samplingbar.cpp
-       signaldata.cpp
-       sigsession.cpp
-       signal.cpp
+       pv/about.cpp
+       pv/datasnapshot.cpp
+       pv/logicdata.cpp
+       pv/logicdatasnapshot.cpp
+       pv/logicsignal.cpp
+       pv/mainwindow.cpp
+       pv/samplingbar.cpp
+       pv/signaldata.cpp
+       pv/sigsession.cpp
+       pv/signal.cpp
        pv/view/header.cpp
        pv/view/ruler.cpp
        pv/view/view.cpp
@@ -33,10 +57,10 @@ set(pulseview_SOURCES
 )
 
 set(pulseview_HEADERS
-       about.h
-       mainwindow.h
-       samplingbar.h
-       sigsession.h
+       pv/about.h
+       pv/mainwindow.h
+       pv/samplingbar.h
+       pv/sigsession.h
        pv/view/header.h
        pv/view/ruler.h
        pv/view/view.h
@@ -44,7 +68,7 @@ set(pulseview_HEADERS
 )
 
 set(pulseview_FORMS
-       about.ui
+       pv/about.ui
 )
 
 set(pulseview_RESOURCES
@@ -52,10 +76,10 @@ set(pulseview_RESOURCES
 )
 
 set(pulseview_TEST_SOURCES
+       pv/datasnapshot.cpp
+       pv/logicdatasnapshot.cpp
        test/logicdatasnapshot.cpp
        test/test.cpp
-       datasnapshot.cpp
-       logicdatasnapshot.cpp
 )
 
 qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
@@ -71,12 +95,14 @@ add_definitions(-DAPP_VERSION="${VERSION}")
 if(WIN32)
 include_directories(
        ${include_directories}
+       ${CMAKE_CURRENT_BINARY_DIR}
        ${Boost_INCLUDE_DIRS}
        ${PKGDEPS_STATIC_INCLUDE_DIRS}
 )
 else(WIN32)
 include_directories(
        ${include_directories}
+       ${CMAKE_CURRENT_BINARY_DIR}
        ${Boost_INCLUDE_DIRS}
        ${PKGDEPS_INCLUDE_DIRS}
 )
@@ -117,6 +143,10 @@ target_link_libraries(pulseview
 )
 endif(WIN32)
 
+install(PROGRAMS pulseview DESTINATION bin/)
+
+if(ENABLE_TESTS)
+
 add_definitions(-DBOOST_TEST_DYN_LINK)
 
 add_executable(pulseview-test
@@ -140,3 +170,5 @@ endif(WIN32)
 
 enable_testing()
 add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test)
+
+endif(ENABLE_TESTS)