From a94040b875526115bba3fbcbc1414021fbca0bfe Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Tue, 15 Feb 2011 16:44:24 +0100 Subject: [PATCH] Don't pollute source dir while building third party libs. --- qxt/qxtweb-standalone/CMakeLists.txt | 3 --- rtaudio/CMakeLists.txt | 4 ---- src/CMakeLists.win32.txt | 6 ++---- src/libtomahawk/CMakeLists.txt | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/qxt/qxtweb-standalone/CMakeLists.txt b/qxt/qxtweb-standalone/CMakeLists.txt index cbea35025..ec81d04cb 100644 --- a/qxt/qxtweb-standalone/CMakeLists.txt +++ b/qxt/qxtweb-standalone/CMakeLists.txt @@ -9,9 +9,6 @@ include( ${QT_USE_FILE} ) SET(qxtweb "qxtweb") -SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") -SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") -SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") ADD_DEFINITIONS(-Wall -O2 -DNDEBUG) IF(NOT WIN32) ADD_DEFINITIONS(-fPIC) diff --git a/rtaudio/CMakeLists.txt b/rtaudio/CMakeLists.txt index df7cd0368..73bfe84d3 100644 --- a/rtaudio/CMakeLists.txt +++ b/rtaudio/CMakeLists.txt @@ -4,10 +4,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR) SET(CMAKE_VERBOSE_MAKEFILE ON) SET(CMAKE_INSTALL_PREFIX ".") -SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") -SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") -SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") - #ADD_DEFINITIONS(-Wall -O2 -DNDEBUG) #ADD_DEFINITIONS(-fPIC) diff --git a/src/CMakeLists.win32.txt b/src/CMakeLists.win32.txt index e4cced677..84145d4be 100644 --- a/src/CMakeLists.win32.txt +++ b/src/CMakeLists.win32.txt @@ -17,10 +17,8 @@ SET( OS_SPECIFIC_LINK_LIBRARIES # third party shipped with tomahawk ${CMAKE_BINARY_DIR}/thirdparty/qtweetlib/libtomahawk_qtweetlib.dll - - # fix them, they should be in ${CMAKE_BINARY_DIR} as well - ${CMAKE_SOURCE_DIR}/rtaudio/librtaudio.dll - ${CMAKE_SOURCE_DIR}/qxt/qxtweb-standalone/libqxtweb-standalone.dll + ${CMAKE_BINARY_DIR}/rtaudio/librtaudio.dll + ${CMAKE_BINARY_DIR}/qxt/qxtweb-standalone/libqxtweb-standalone.dll # system libs "secur32.dll" diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index f141bfc02..3c452790f 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -326,7 +326,7 @@ SET( OS_SPECIFIC_LINK_LIBRARIES "winmm.dll" "advapi32.dll" - ${CMAKE_SOURCE_DIR}/rtaudio/librtaudio.dll + ${CMAKE_BINARY_DIR}/rtaudio/librtaudio.dll ) ENDIF( WIN32 )