projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved all classes into the pv namespace
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 0cebe79c7e546b5fb729c9e12182634c1b192ffc..3741e2a72b3541431330a65b5c0e88afd3332b84 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-39,17
+39,17
@@
find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
set(VERSION 0.1.0)
set(pulseview_SOURCES
set(VERSION 0.1.0)
set(pulseview_SOURCES
- about.cpp
- datasnapshot.cpp
- logicdata.cpp
- logicdatasnapshot.cpp
- logicsignal.cpp
main.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
pv/view/header.cpp
pv/view/ruler.cpp
pv/view/view.cpp
@@
-57,10
+57,10
@@
set(pulseview_SOURCES
)
set(pulseview_HEADERS
)
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
pv/view/header.h
pv/view/ruler.h
pv/view/view.h
@@
-68,7
+68,7
@@
set(pulseview_HEADERS
)
set(pulseview_FORMS
)
set(pulseview_FORMS
- about.ui
+
pv/
about.ui
)
set(pulseview_RESOURCES
)
set(pulseview_RESOURCES
@@
-76,10
+76,10
@@
set(pulseview_RESOURCES
)
set(pulseview_TEST_SOURCES
)
set(pulseview_TEST_SOURCES
+ pv/datasnapshot.cpp
+ pv/logicdatasnapshot.cpp
test/logicdatasnapshot.cpp
test/test.cpp
test/logicdatasnapshot.cpp
test/test.cpp
- datasnapshot.cpp
- logicdatasnapshot.cpp
)
qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
)
qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
@@
-95,12
+95,14
@@
add_definitions(-DAPP_VERSION="${VERSION}")
if(WIN32)
include_directories(
${include_directories}
if(WIN32)
include_directories(
${include_directories}
+ ${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS}
${PKGDEPS_STATIC_INCLUDE_DIRS}
)
else(WIN32)
include_directories(
${include_directories}
${Boost_INCLUDE_DIRS}
${PKGDEPS_STATIC_INCLUDE_DIRS}
)
else(WIN32)
include_directories(
${include_directories}
+ ${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS}
${PKGDEPS_INCLUDE_DIRS}
)
${Boost_INCLUDE_DIRS}
${PKGDEPS_INCLUDE_DIRS}
)