From 7e500a2fa85b9b6e5590c3ab618c1558ba9d84da Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Mon, 1 Mar 2010 12:55:51 +0000
Subject: [PATCH] fix build and move gtest to 3rdparty

---
 src/CMakeLists.txt   |  5 +++--
 tests/CMakeLists.txt | 18 +++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 097ab65c5..a6e11412c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -154,6 +154,7 @@ add_library(clementine_lib
    ${CLEMENTINE-SOURCES}
    ${CLEMENTINE-SOURCES-MOC}
    ${CLEMENTINE-SOURCES-UI}
+   ${CLEMENTINE-SOURCES-RESOURCE}
 )
 target_link_libraries(clementine_lib
     ${QT_LIBRARIES}
@@ -162,7 +163,6 @@ target_link_libraries(clementine_lib
     ${XINE_LIBRARIES}
     ${LIBNOTIFY_LIBRARIES}
     ${TAGLIB_LIBRARIES}
-    ${CLEMENTINE-SOURCES-RESOURCE}
     lastfm
 )
 if (APPLE)
@@ -191,4 +191,5 @@ set_target_properties(clementine PROPERTIES
 )
 
 install(TARGETS clementine
-  BUNDLE DESTINATION bin)
+  BUNDLE DESTINATION bin
+  RUNTIME DESTINATION bin)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c76d5b858..8023e00f1 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,24 +1,24 @@
 cmake_minimum_required(VERSION 2.6)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../gtest)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../gtest/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/gtest)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/gtest/include)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../src)
 
 set(GTEST-SOURCES
-    ../gtest/src/gtest.cc
-    ../gtest/src/gtest-death-test.cc
-    ../gtest/src/gtest-filepath.cc
-    ../gtest/src/gtest-port.cc
-    ../gtest/src/gtest-test-part.cc
-    ../gtest/src/gtest-typed-test.cc
+    ../3rdparty/gtest/src/gtest.cc
+    ../3rdparty/gtest/src/gtest-death-test.cc
+    ../3rdparty/gtest/src/gtest-filepath.cc
+    ../3rdparty/gtest/src/gtest-port.cc
+    ../3rdparty/gtest/src/gtest-test-part.cc
+    ../3rdparty/gtest/src/gtest-typed-test.cc
 )
 
 add_library(gtest ${GTEST-SOURCES})
 
 
 set(SONGTEST-SOURCES
-    ../gtest/src/gtest_main.cc
+    ../3rdparty/gtest/src/gtest_main.cc
     ../src/song.cpp
     song_test.cpp)