summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-04-17 19:38:23 -0500
committerDarrell Anderson <[email protected]>2012-04-17 19:38:23 -0500
commit975dabcfab6b6f3813667ead158b30895363ebf6 (patch)
treed76881641cb6fb2e560b89099c25ed5083761a90
parentf6c298bae19c7d102f0ddac9b15e6f52d735745a (diff)
downloadrosegarden-975dabcfab6b6f3813667ead158b30895363ebf6.tar.gz
rosegarden-975dabcfab6b6f3813667ead158b30895363ebf6.zip
Allow building with or without liblo being installed.
liblo is recommended but not a required dependency. This resolves bug report 948.
-rw-r--r--src/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8a1229b..27aa486 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -102,7 +102,7 @@ ADD_DEPENDENCIES(rosegardensequencer RosegardenCommon-static)
tde_add_library( RosegardenExtended STATIC AUTOMOC
SOURCES ${document_SRCS} ${gui_SRCS} ${gui_dcop_SRCS} ${ui_SRCS}
- LINK dl lo
+ LINK dl ${LIBLO_LIBS}
DESTINATION ${LIB_INSTALL_DIR}
)
@@ -129,7 +129,7 @@ tde_add_library( RosegardenSegmentCanvas STATIC AUTOMOC
tde_add_executable( rosegarden AUTOMOC
SOURCES gui/application/main.cpp
- LINK dl lo tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} kio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon
+ LINK dl tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} kio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon
DESTINATION ${BIN_INSTALL_DIR}
)
@@ -157,7 +157,7 @@ if( WANT_TEST )
tde_add_executable( RosegardenTestDriver AUTOMOC
SOURCES RosegardenTestDriver.cpp ${tests_SRCS}
- LINK dl lo tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} kio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon
+ LINK dl tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} kio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon
DESTINATION ${BIN_INSTALL_DIR}
)