See ChangeLog

5 files changed, 23 insertions, 8 deletions

diff --git a/muse2/muse/CMakeLists.txt b/muse2/muse/CMakeLists.txt
index bc67203b..fef848ad 100644
--- a/muse2/muse/CMakeLists.txt
+++ b/muse2/muse/CMakeLists.txt
@@ -321,16 +321,22 @@ target_link_libraries(muse
       
       ${QT_LIBRARIES}
       QtSvg
-      ${ALSA_LIB}
-      ${JACK_LIB}
-      ${SNDFILE_LIB}
-      ${SAMPLERATE_LIB}
-      ${UUID_LIB}
+      ${ALSA_LIBRARIES}
+      ${JACK_LIBRARIES}
+      ${SNDFILE_LIBRARIES}
+      ${SAMPLERATE_LIBRARIES}
+      ${UUID_LIBRARIES}
       ${PYLIBS}
-      ${LASH_LIB}
       ${FST_LIB}
-      ${LIBLO_LIB}
       )
 
-install_targets ( /bin muse )
+if(HAVE_LASH)
+      target_link_libraries(muse ${LASH_LIBRARIES})
+endif(HAVE_LASH)
+
+if(OSC_SUPPORT)
+      target_link_libraries(muse ${LIBLO_LIBRARIES})
+endif(OSC_SUPPORT)
+
+install ( FILES ${PROJECT_BINARY_DIR}/muse/muse DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ RENAME muse2 )
 
diff --git a/muse2/muse/arranger/CMakeLists.txt b/muse2/muse/arranger/CMakeLists.txt
index c838c86b..5f886e39 100644
--- a/muse2/muse/arranger/CMakeLists.txt
+++ b/muse2/muse/arranger/CMakeLists.txt
@@ -40,6 +40,8 @@ add_library ( arranger STATIC
       # ${arranger_ui_headers}
       )
 
+add_dependencies(arranger mixer)
+
 set_target_properties( arranger
   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
   )
diff --git a/muse2/muse/liste/CMakeLists.txt b/muse2/muse/liste/CMakeLists.txt
index dd1b4e0b..5ffbf0dd 100644
--- a/muse2/muse/liste/CMakeLists.txt
+++ b/muse2/muse/liste/CMakeLists.txt
@@ -49,6 +49,9 @@ add_library ( liste STATIC
       ${liste_mocs}
       ${liste_ui_headers}
       )
+
+add_dependencies(liste widgets)
+
 set_target_properties( liste
    PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
    )
diff --git a/muse2/muse/midiedit/CMakeLists.txt b/muse2/muse/midiedit/CMakeLists.txt
index 846cd347..37fa6073 100644
--- a/muse2/muse/midiedit/CMakeLists.txt
+++ b/muse2/muse/midiedit/CMakeLists.txt
@@ -86,6 +86,8 @@ add_library ( midiedit STATIC
       ecanvas.cpp # ecanvas.h
       )
 
+add_dependencies(midiedit widgets)
+
 set_target_properties( midiedit
       PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
       )
diff --git a/muse2/muse/mplugins/CMakeLists.txt b/muse2/muse/mplugins/CMakeLists.txt
index 005197dd..da2ad902 100644
--- a/muse2/muse/mplugins/CMakeLists.txt
+++ b/muse2/muse/mplugins/CMakeLists.txt
@@ -54,6 +54,8 @@ add_library ( mplugins STATIC
       ${mplugins_uis}
       )
 
+add_dependencies(mplugins widgets)
+
 #target_link_libraries( mplugins
 #   # midiplugin
 #   ${QT_LIBRARIES}