From 84d80f6a100e5349fedb7a3cd6b249009b6dbc6e Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Fri, 5 Mar 2010 10:11:04 +0000
Subject: [PATCH] Explicitly link test_utils.cpp with Qt. Fixes issue #58

---
 tests/CMakeLists.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8bd473a88..e0311b42d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -13,7 +13,6 @@ set(GTEST-SOURCES
     ../3rdparty/gmock/gtest/src/gtest-port.cc
     ../3rdparty/gmock/gtest/src/gtest-test-part.cc
     ../3rdparty/gmock/gtest/src/gtest-typed-test.cc
-    test_utils.cpp
 )
 
 add_library(gtest ${GTEST-SOURCES})
@@ -29,16 +28,17 @@ set(GMOCK-SOURCES
 add_library(gmock ${GMOCK-SOURCES})
 target_link_libraries(gmock gtest)
 
-set(MOCK-SOURCES
+set(TESTUTILS-SOURCES
+    test_utils.cpp
     mock_networkaccessmanager.cpp)
 
-set(MOCK-MOC-HEADERS
+set(TESTUTILS-MOC-HEADERS
     mock_networkaccessmanager.h)
 
-qt4_wrap_cpp(MOCK-SOURCES-MOC ${MOCK-MOC-HEADERS})
+qt4_wrap_cpp(TESTUTILS-SOURCES-MOC ${TESTUTILS-MOC-HEADERS})
 
-add_library(mocks ${MOCK-SOURCES} ${MOCK-SOURCES-MOC})
-target_link_libraries(mocks gmock)
+add_library(test_utils ${TESTUTILS-SOURCES} ${TESTUTILS-SOURCES-MOC})
+target_link_libraries(test_utils gmock ${QT_LIBRARIES})
 
 add_custom_target(test
     echo "Running tests"
@@ -52,7 +52,7 @@ macro(add_test_file test_source)
        ${test_source}
        main.cpp
     )
-    target_link_libraries(${TEST_NAME} gmock clementine_lib mocks)
+    target_link_libraries(${TEST_NAME} gmock clementine_lib test_utils)
     add_custom_command(TARGET test POST_BUILD
         COMMAND ./${TEST_NAME})
     add_dependencies(test ${TEST_NAME})