Moved unit test build commands into test/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a54708e3f61a8c9079dff7a3bda7e285b03a0cb2..dc576ed1e985fd41c0f8b5b00a34306973ed0322 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,11 +53,7 @@ endif()
 
 find_package(Qt4 REQUIRED)
 
-if(ENABLE_TESTS)
-find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
-else()
 find_package(Boost 1.46)
-endif()
 
 #===============================================================================
 #= Config Header

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 363470bba5761cc30a4db25e5617af924ebbbd35..6da1a2475b3908b02d1fb7db42adeaf50bb272f9 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -18,6 +18,8 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
+find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
+
 set(pulseview_TEST_SOURCES
        ${PROJECT_SOURCE_DIR}/pv/datasnapshot.cpp
        ${PROJECT_SOURCE_DIR}/pv/logicdatasnapshot.cpp
@@ -27,6 +29,14 @@ set(pulseview_TEST_SOURCES
 
 add_definitions(-DBOOST_TEST_DYN_LINK)
 
+include_directories(
+       ${Boost_INCLUDE_DIRS}
+)
+
+set(PULSEVIEW_LINK_LIBS
+       ${Boost_LIBRARIES}
+)
+
 add_executable(pulseview-test
        ${pulseview_TEST_SOURCES}
 )