Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

fix build and move gtest to 3rdparty

This commit is contained in:
John Maguire 2010-03-01 12:55:51 +00:00
parent e7c064809c
commit 7e500a2fa8
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/CMakeLists.txt
View File

@ -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)

18
tests/CMakeLists.txt
View File

@ -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)