diff --git a/CMakeLists.txt b/CMakeLists.txt index 1dcc21dc2..90d58cd7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -339,10 +339,10 @@ CONFIGURE_FILE( "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) -# KDE4 defines an uninstall target for us automatically -IF( NOT KDE4_FOUND ) - ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") -ENDIF() +# KDE4 defines an uninstall target for us automatically (and at least with Qt4 Phonon does as well no matter if kdelibs was found) +# IF( NOT KDE4_FOUND ) +# ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") +# ENDIF() IF( NOT APPLE ) # Make linking as strict on linux as it is on osx. Then we don't break linking on mac so often diff --git a/admin/win/Toolchain-mingw32-openSUSE.cmake b/admin/win/Toolchain-mingw32-openSUSE.cmake index 1f58e2188..59ec83d27 100644 --- a/admin/win/Toolchain-mingw32-openSUSE.cmake +++ b/admin/win/Toolchain-mingw32-openSUSE.cmake @@ -32,3 +32,6 @@ SET(QT_MOC_EXECUTABLE ${MINGW_PREFIX}-moc) SET(QT_RCC_EXECUTABLE ${MINGW_PREFIX}-rcc) SET(QT_UIC_EXECUTABLE ${MINGW_PREFIX}-uic) SET(QT_LRELEASE_EXECUTABLE ${MINGW_PREFIX}-lrelease) + +# phonon -_- +SET(Automoc4_DIR "/usr/lib64/automoc4/")