projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
951c583
)
Added section headers to CMakeLists.txt
author
Alexandru Gagniuc
<mr.nuke.me@gmail.com>
Fri, 12 Oct 2012 22:51:14 +0000
(23:51 +0100)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Fri, 12 Oct 2012 23:19:27 +0000
(
00:19
+0100)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 07c2d4b98531299433ac1b9497c082b7b91e5b8b..3adb9675c620ce287db1ae07fa2edb286b2d02d1 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-2,6
+2,7
@@
## This file is part of the PulseView project.
##
## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
## This file is part of the PulseView project.
##
## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+## Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
##
## 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
##
## 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
@@
-22,6
+23,10
@@
include(FindPkgConfig)
project(pulseview)
project(pulseview)
+#===============================================================================
+#= Dependencies
+#-------------------------------------------------------------------------------
+
find_package(PkgConfig)
pkg_check_modules(PKGDEPS REQUIRED
libsigrokdecode>=0.1.0
find_package(PkgConfig)
pkg_check_modules(PKGDEPS REQUIRED
libsigrokdecode>=0.1.0
@@
-38,6
+43,10
@@
find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
set(VERSION 0.1.0)
set(VERSION 0.1.0)
+#===============================================================================
+#= Sources
+#-------------------------------------------------------------------------------
+
set(pulseview_SOURCES
main.cpp
pv/about.cpp
set(pulseview_SOURCES
main.cpp
pv/about.cpp
@@
-88,9
+97,17
@@
qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
include(${QT_USE_FILE})
include(${QT_USE_FILE})
+#===============================================================================
+#= Global Definitions
+#-------------------------------------------------------------------------------
+
add_definitions(${QT_DEFINITIONS})
add_definitions(-DAPP_VERSION="${VERSION}")
add_definitions(${QT_DEFINITIONS})
add_definitions(-DAPP_VERSION="${VERSION}")
+#===============================================================================
+#= Global Include Directories
+#-------------------------------------------------------------------------------
+
# On Windows/MinGW we need PKGDEPS_STATIC_INCLUDE_DIRS.
if(WIN32)
include_directories(
# On Windows/MinGW we need PKGDEPS_STATIC_INCLUDE_DIRS.
if(WIN32)
include_directories(
@@
-108,6
+125,10
@@
else(WIN32)
)
endif(WIN32)
)
endif(WIN32)
+#===============================================================================
+#= Linker Configuration
+#-------------------------------------------------------------------------------
+
# On Windows/MinGW we need PKGDEPS_STATIC_LIBRARY_DIRS.
if(WIN32)
link_directories(
# On Windows/MinGW we need PKGDEPS_STATIC_LIBRARY_DIRS.
if(WIN32)
link_directories(
@@
-143,8
+164,16
@@
else(WIN32)
)
endif(WIN32)
)
endif(WIN32)
+#===============================================================================
+#= Installation
+#-------------------------------------------------------------------------------
+
install(PROGRAMS pulseview DESTINATION bin/)
install(PROGRAMS pulseview DESTINATION bin/)
+#===============================================================================
+#= Tests
+#-------------------------------------------------------------------------------
+
if(ENABLE_TESTS)
add_definitions(-DBOOST_TEST_DYN_LINK)
if(ENABLE_TESTS)
add_definitions(-DBOOST_TEST_DYN_LINK)