diff --git a/CMakeLists.txt b/CMakeLists.txt index 641be0490..34c7f7d92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,9 +188,6 @@ endif() find_package(Qt5LinguistTools REQUIRED) -macro(setup_qt) -endmacro() - set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}") # FIXME: CrashReporter depends on deprecated QHttp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 70b182ee1..e24d6ab4e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,5 @@ include( ${PROJECT_BINARY_DIR}/TomahawkUse.cmake ) -setup_qt() - include_directories( ${CMAKE_CURRENT_BINARY_DIR}/libtomahawk ) include_directories( ${CMAKE_CURRENT_LIST_DIR}/libtomahawk ) diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt index 4b0636ecd..5a88819a6 100644 --- a/src/crashreporter/CMakeLists.txt +++ b/src/crashreporter/CMakeLists.txt @@ -3,8 +3,6 @@ cmake_policy(SET CMP0017 NEW) set(TOMAHAWK_CRASH_REPORTER_TARGET ${TOMAHAWK_BASE_TARGET_NAME}_crash_reporter) -setup_qt() - list(APPEND crashreporter_SOURCES main.cpp) list(APPEND crashreporter_RC resources.qrc) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 2e600f8bd..979a251fb 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -1,5 +1,3 @@ -setup_qt() - include_directories(${CMAKE_CURRENT_LIST_DIR}/../tomahawk ${CMAKE_CURRENT_LIST_DIR}/../libtomahawk) include(tomahawk_add_test.cmake) diff --git a/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt b/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt index d44f967c3..548854429 100644 --- a/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt +++ b/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt @@ -7,8 +7,6 @@ IF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 ) CMAKE_POLICY(SET CMP0017 NEW) ENDIF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 ) -setup_qt() - SET( qxtcore "core" ) SET( qxtnet "network" ) SET( qxtweb "web" )