Commit ac791640 authored by Nicolas Fella's avatar Nicolas Fella

Merge conditions

parent 0f9fa8e3
...@@ -53,6 +53,7 @@ else() ...@@ -53,6 +53,7 @@ else()
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
set(KF5_OPTIONAL_COMPONENTS ${KF5_OPTIONAL_COMPONENTS} Runner) set(KF5_OPTIONAL_COMPONENTS ${KF5_OPTIONAL_COMPONENTS} Runner)
find_package(KF5PulseAudioQt)
endif() endif()
find_package(Qca-qt5 ${QCA_MIN_VERSION} REQUIRED) find_package(Qca-qt5 ${QCA_MIN_VERSION} REQUIRED)
...@@ -63,9 +64,6 @@ else() ...@@ -63,9 +64,6 @@ else()
TYPE RUNTIME TYPE RUNTIME
) )
if(NOT WIN32 AND NOT APPLE)
find_package(KF5PulseAudioQt)
endif()
add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_KEYWORDS -DQT_NO_CAST_FROM_ASCII -DHAVE_KIO) add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_KEYWORDS -DQT_NO_CAST_FROM_ASCII -DHAVE_KIO)
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment