summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoudhayan Gupta <me@BaloneyGeek.com>2015-09-26 10:38:35 (GMT)
committerBoudhayan Gupta <me@BaloneyGeek.com>2015-09-26 10:38:35 (GMT)
commit8da63fa7814aeecb9262ff028733d689e85ce579 (patch)
tree8bbe55bd521eba1f2e62dd7ce1f1f3448fadce9a
parent1475e38606ac04d3594e7213b2318c63dc960f4a (diff)
Re-enable WorkManLib
-rw-r--r--src/CMakeLists.txt11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 51ad8d2..b633bf2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_C_FLAGS "-std=c99") ## ALSA no longer compiles with -std=c90, see https://bugzilla.novell.com/show_bug.cgi?id=817077
endif()
-find_package(ALSA)
+find_package(Alsa)
+alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
set(wmlib_audio_SRCS
wmlib/audio/audio.c
@@ -45,10 +46,6 @@ else (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME STREQUAL GNU)
set(USE_WMLIB true)
endif (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME STREQUAL GNU)
-# Disable WMLib temporarily
-
-set(USE_WMLIB false)
-
set(KCD_LIB_SRCS
kcompactdisc.cpp
kcompactdisc_p.cpp
@@ -56,8 +53,8 @@ set(KCD_LIB_SRCS
)
if (USE_WMLIB)
- set(KCD_LIB_SRCS ${KCD_LIB_SRCS} wmlib_interface.cpp ${wmlib_SRCS} ${wmlib_audio_SRCS})
- add_definitions(-DUSE_WMLIB=1)
+ set(KCD_LIB_SRCS ${KCD_LIB_SRCS} wmlib_interface.cpp ${wmlib_SRCS} ${wmlib_audio_SRCS})
+ add_definitions(-DUSE_WMLIB=1)
endif (USE_WMLIB)
add_library(KF5CompactDisc SHARED ${KCD_LIB_SRCS})