diff -rupN clementine-0.2.old/CMakeLists.txt clementine-0.2/CMakeLists.txt --- clementine-0.2.old/CMakeLists.txt 2010-03-22 14:35:31.000000000 -0400 +++ clementine-0.2/CMakeLists.txt 2010-04-17 16:06:29.000000000 -0400 @@ -83,8 +83,6 @@ if (WIN32) endif(WIN32) # Subdirectories -add_subdirectory(3rdparty/qtsingleapplication) -add_subdirectory(3rdparty/qxt) add_subdirectory(src) add_subdirectory(tests) diff -rupN clementine-0.2.old/src/CMakeLists.txt clementine-0.2/src/CMakeLists.txt --- clementine-0.2.old/src/CMakeLists.txt 2010-03-22 14:35:31.000000000 -0400 +++ clementine-0.2/src/CMakeLists.txt 2010-04-17 16:11:00.000000000 -0400 @@ -193,9 +193,9 @@ qt4_add_resources(CLEMENTINE-SOURCES-RES include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/qtsingleapplication") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/qxt") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/gmock/gtest/include") +include_directories("/usr/include/QtSolutions/") +include_directories("/usr/include/QxtGui/") +include_directories("/usr/include/QxtCore/") set(EXECUTABLE_OUTPUT_PATH ..) add_library(clementine_lib @@ -206,8 +206,8 @@ add_library(clementine_lib ${CLEMENTINE-QM-FILES} ) target_link_libraries(clementine_lib - qtsingleapplication - qxt + QtSolutions_SingleApplication-2.6 + QxtCore QxtGui lastfm ${XINE_LIBRARIES} ${LIBNOTIFY_LIBRARIES} @@ -220,7 +220,7 @@ if (APPLE) ) include_directories(${GROWL}/Headers) endif (APPLE) -add_dependencies(clementine_lib qtsingleapplication qxt) +add_dependencies(clementine_lib QtSolutions_SingleApplication-2.6 QxtCore QxtGui) # Link against the qsqlite plugin on windows if(WIN32)