See ChangeLog

30 files changed, 245 insertions, 137 deletions

diff --git a/muse2/CMakeLists.txt b/muse2/CMakeLists.txt
index a0520d6c..0b1d2e09 100644
--- a/muse2/CMakeLists.txt
+++ b/muse2/CMakeLists.txt
@@ -18,6 +18,10 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
+include(FindPkgConfig)
+include(cmake/Summary.cmake)
+include(cmake/TargetDoc.cmake)
+
 project(muse)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4.1)
 if (COMMAND cmake_policy)
@@ -29,6 +33,10 @@ if (NOT CMAKE_INSTALL_LIBDIR)
 	SET(CMAKE_INSTALL_LIBDIR "lib")
 endif (NOT CMAKE_INSTALL_LIBDIR)
 
+IF(NOT DEFINED SHARE_INSTALL_PREFIX)
+        SET(SHARE_INSTALL_PREFIX share)
+ENDIF(NOT DEFINED SHARE_INSTALL_PREFIX)
+
 #set(CMAKE_BUILD_TYPE debug)
 #set(CMAKE_BUILD_TYPE release)
 
@@ -47,8 +55,6 @@ SET(MusE_VERSION       "2.0.1")
 SET(MusE_VERSION_FULL  "2.0.1")
 SET(MusE_INSTALL_NAME  "muse-2.0")
 
-include ( ${PROJECT_SOURCE_DIR}/cmake/UsePkgConfig1.cmake )
-include ( ${PROJECT_SOURCE_DIR}/cmake/TargetDoc.cmake)
 # include ( ${PROJECT_SOURCE_DIR}/cmake/WrapMacros.cmake)
 
 option ( ENABLE_LASH        "enable LASH Audio Session Handler"                              ON)
@@ -134,46 +140,30 @@ include ( ${PROJECT_SOURCE_DIR}/cmake/QtWrapMacros.cmake)
 if (APPLE)
 	message("Disabling ALSA support due to OS X build.")
 else (APPLE)
-PKGCONFIG (alsa 0.9.0 ALSA_INCDIR ALSA_LIBDIR ALSA_LIB ALSA_CPP )
-if (NOT ALSA_INCDIR)
-      message(FATAL_ERROR "Fatal error: ALSA >= 1.0.0 required")
-else (NOT ALSA_INCDIR)
-	message("Alsa found.")
-endif (NOT ALSA_INCDIR)
+PKG_CHECK_MODULES(ALSA REQUIRED alsa>=0.9.0)
+include_directories(${ALSA_INCLUDE_DIRS})
 endif (APPLE)
 
 ##
 ## find sndfile >= 1.0.0
 ##
 
-PKGCONFIG (sndfile 1.0.0 SNDFILE_INCDIR SNDFILE_LIBDIR SNDFILE_LIB SNDFILE_CPP )
-if (NOT SNDFILE_INCDIR)
-      message(FATAL_ERROR "Fatal error: libsndfile >= 1.0.0 required")
-else (NOT SNDFILE_INCDIR)
-	message("sndfile found.")
-endif (NOT SNDFILE_INCDIR)
+PKG_CHECK_MODULES(SNDFILE REQUIRED sndfile>=1.0.0)
+include_directories(${SNDFILE_INCLUDE_DIRS})
 
 ##
 ## find libsamplerate >= 0.1.0
 ##
 
-PKGCONFIG (samplerate 0.1.0 SAMPLERATE_INCDIR SAMPLERATE_LIBDIR SAMPLERATE_LIB SAMPLERATE_CPP )
-if (NOT SAMPLERATE_INCDIR)
-      message(FATAL_ERROR "Fatal error: libsamplerate >= 0.1.0 required")
-else (NOT SAMPLERATE_INCDIR)
-	message("samplerate found")
-endif (NOT SAMPLERATE_INCDIR)
+PKG_CHECK_MODULES(SAMPLERATE REQUIRED samplerate>=0.1.0)
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
 
 ##
 ## find libuuid 
 ##
 
-PKGCONFIG (uuid 0.0.1 UUID_INCDIR UUID_LIBDIR UUID_LIB UUID_CPP )
-if (NOT UUID_INCDIR)
-      message(FATAL_ERROR "Fatal error: libuuid >= 0.0.1 required")
-else (NOT UUID_INCDIR)
-        message("uuid lib found")
-endif (NOT UUID_INCDIR)
+PKG_CHECK_MODULES(UUID REQUIRED uuid>=0.0.1)
+include_directories(${UUID_INCLUDE_DIRS})
 
 # AC_CHECK_HEADER(uuid/uuid.h, UUID_FOUND="yes", UUID_FOUND="no")
 # if test x$UUID_FOUND = xno; then
@@ -197,33 +187,19 @@ endif (NOT UUID_INCDIR)
 ## find jack >= 0.103.0
 ##
 
-PKGCONFIG (jack 0.107.0 JACK_INCDIR JACK_LIBDIR JACK_LIB JACK_CPP )
-if (NOT JACK_INCDIR)
-      PKGCONFIG (jack 0.103.0 JACK_INCDIR JACK_LIBDIR JACK_LIB JACK_CPP )
-      if (NOT JACK_INCDIR)
-            message(FATAL_ERROR "Fatal error: JACK >= 0.103 required")
-      else (NOT JACK_INCDIR)
-	      message("JACK 0.103 found")
-            set(JACK103 ON)
-      endif (NOT JACK_INCDIR)
-else (NOT JACK_INCDIR)
-	message("JACK 0.107 found")
-      set(JACK107 ON)
-endif (NOT JACK_INCDIR)
+PKG_CHECK_MODULES(JACK REQUIRED jack>=0.103)
+include_directories(${JACK_INCLUDE_DIRS})
 
 ##
 ## find LASH 
 ##
 
 if (ENABLE_LASH)
-      PKGCONFIG (lash 0.2 LASH_INCDIR LASH_LIBDIR LASH_LIB LASH_CPP )
-      if (NOT LASH_INCDIR)
-            message("Error: lash >= 0.2 not found, disabling feature")
-      else (NOT LASH_INCDIR)
-            message("lash >= 0.2 found.")
-            set (HAVE_LASH TRUE)
-            message("LASH enabled")
-      endif (NOT LASH_INCDIR)
+      PKG_CHECK_MODULES(LASH lash-1.0>=0.2)
+      if (LASH_FOUND)
+            include_directories(${LASH_INCLUDE_DIRS})
+            set(HAVE_LASH ON)
+      endif (LASH_FOUND)           
 else (ENABLE_LASH)
       message("LASH disabled")
 endif (ENABLE_LASH)
@@ -266,15 +242,11 @@ endif (ENABLE_LASH)
 ##
 
 if (ENABLE_OSC)
-      PKGCONFIG (liblo 0.23 LIBLO_INCDIR LIBLO_LIBDIR LIBLO_LIB LIBLO_CPP )
-      if (NOT LIBLO_INCDIR)
-            message("Error: liblo >= 0.23 not found, disabling feature")
-            set ( ENABLE_OSC OFF )
-      else (NOT LIBLO_INCDIR)
-            message("liblo >= 0.23 found.")
-            set (OSC_SUPPORT TRUE)
-            message("OSC enabled")
-      endif (NOT LIBLO_INCDIR)
+      PKG_CHECK_MODULES(LIBLO liblo>=0.23)
+      if (LIBLO_FOUND)
+            include_directories(${LIBLO_INCLUDE_DIRS})
+            set(OSC_SUPPORT ON)
+      endif (LIBLO_FOUND)
 else (ENABLE_OSC)
       message("OSC disabled")
 endif (ENABLE_OSC)
@@ -284,15 +256,11 @@ endif (ENABLE_OSC)
 ##
 
 if (ENABLE_DSSI)
-      PKGCONFIG (dssi 0.9.0 DSSI_INCDIR DSSI_LIBDIR DSSI_LIB DSSI_CPP )
-      if (NOT DSSI_INCDIR)
-            message("Error: dssi >= 0.9.0 not found, disabling feature")
-            set ( ENABLE_DSSI OFF )
-      else (NOT DSSI_INCDIR)
-            message("dssi >= 0.9.0 found.")
-            set (DSSI_SUPPORT TRUE)
-            message("DSSI enabled")
-      endif (NOT DSSI_INCDIR)
+      PKG_CHECK_MODULES(DSSI dssi>=0.9.0)
+      if (DSSI_FOUND)
+            include_directories(${DSSI_INCLUDE_DIRS})
+            set(DSSI_SUPPORT ON)
+      endif (DSSI_FOUND)
 else (ENABLE_DSSI)
       message("DSSI disabled")
 endif (ENABLE_DSSI)
@@ -317,14 +285,25 @@ SET (USE_SSE false)
 ## check for fluidsynth
 ##
 
+if (ENABLE_LASH)
+      PKG_CHECK_MODULES(LASH lash-1.0>=0.2)
+      if (LASH_FOUND)
+            include_directories(${LASH_INCLUDE_DIRS})
+            set(HAVE_LASH ON)
+      endif (LASH_FOUND)           
+else (ENABLE_LASH)
+      message("LASH disabled")
+endif (ENABLE_LASH)
+
+
 if ( ENABLE_FLUID )
-      PKGCONFIG (fluidsynth 1.0.0 FLUID_INCDIR FLUID_LIBDIR FLUID_LIB FLUID_CPP )
-      if (NOT FLUID_INCDIR)
-            message("Error: fluidsynth >= 0.9.0 not found, disabling feature")
-            set ( ENABLE_FLUID OFF )
-      else (NOT FLUID_INCDIR)
-	    message("Fluidsynth found")
-      endif (NOT FLUID_INCDIR)
+      PKG_CHECK_MODULES(FLUIDSYNTH fluidsynth>=0.9.0)
+      if (FLUIDSYNTH_FOUND)
+            include_directories(${FLUIDSYNTH_INCLUDE_DIRS})
+            set(HAVE_FLUIDSYNTH ON)
+      endif (FLUIDSYNTH_FOUND)
+else ( ENABLE_FLUID )
+      message("Fluidsynth disabled")
 endif ( ENABLE_FLUID )
 
 #
@@ -375,13 +354,6 @@ include_directories(
    ${PROJECT_BINARY_DIR}/muse/widgets
    ${PROJECT_BINARY_DIR}/muse/instruments
    ${PROJECT_BINARY_DIR}/muse/ctrl
-
-   ${ALSA_INCDIR}
-   ${JACK_INCDIR}
-   ${SNDFILE_INCDIR}
-   ${SAMPLERATE_INCDIR}
-   ${LIBLO_INCDIR}
-   ${DSSI_INCDIR}
    )
 
 # include (pch.txt)
@@ -414,13 +386,28 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
   INCLUDE(CPack)
 ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
 
-set(CMAKE_CXX_FLAGS         "-Wl,-rpath,${QT_LIBRARY_DIR} -Wall -Wextra -Winvalid-pch -fno-exceptions")
-set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fomit-frame-pointer -ffast-math -fstrength-reduce")
-set(CMAKE_CXX_FLAGS_DEBUG   "-g -DQT_DEBUG")
+set(CMAKE_CXX_FLAGS         "-Wl,-rpath,${QT_LIBRARY_DIR} -Wall -Wextra -Winvalid-pch -fno-exceptions ${CMAKE_CXX_FLAGS}")
+set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fomit-frame-pointer -ffast-math -fstrength-reduce ${CMAKE_CXX_FLAGS_RELEASE}")
+set(CMAKE_CXX_FLAGS_DEBUG   "-g -DQT_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}")
 
 # subdirs(al awl grepmidi plugins midiplugins muse share synti)
 # subdirs(al lib grepmidi plugins xpm muse share demos doc synti utils)
 #subdirs(al lib grepmidi plugins muse share demos synti )
-subdirs(al grepmidi plugins muse share synti )
-#  TODO        packaging utils)
-
+subdirs(al grepmidi plugins muse share synti packaging utils demos)
+
+# Uninstall support
+configure_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake"
+  IMMEDIATE @ONLY)
+
+add_custom_target(uninstall
+  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake")
+
+# Show a summary of what we got
+summary_add("Lash support" HAVE_LASH)
+summary_add("OSC (Liblo) support" OSC_SUPPORT)
+summary_add("DSSI support" DSSI_SUPPORT)
+summary_add("VST support" VST_SUPPORT)
+summary_add("Fluidsynth support" HAVE_FLUIDSYNTH)
+summary_show()
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index fa86c053..27ad9888 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,7 +1,17 @@
-21.10.2010  Toolbar1 usage of Q3ListBox changed to QTableWidget. (p4.0.3 Tim)
-            More Toolbar1 fixes. (p4.0.4 Tim)
-            Fixed widgets/tools.cpp EditToolBar::EditToolBar connect Q3Action. (p4.0.5 Tim)
-            Crashes: Removed all "undoRedo->removeFrom..." from destructors (~pianoroll() ~drumedit() etc.) (p4.0.6 Tim)
+22.10.2010  
+        - cmake scripts changes thanks to Orcan Ogetbil oget.fedora > gmail.com (Tim.)
+          'make uninstall' facility added! 
+          Drop our obsolete pkgconfig for newer native cmake pkgconfig.
+          LASH detection fixed.
+          Summary added.
+          Renamed installed executable 'muse' to 'muse2' (todo: fix exec permissions.)
+          Install /utils, /packaging, and /demos files.
+          Other minor changes.
+21.10.2010  
+        - Toolbar1 usage of Q3ListBox changed to QTableWidget. (p4.0.3 Tim)
+        - More Toolbar1 fixes. (p4.0.4 Tim)
+        - Fixed widgets/tools.cpp EditToolBar::EditToolBar connect Q3Action. (p4.0.5 Tim)
+        - Crashes: Removed all "undoRedo->removeFrom..." from destructors (~pianoroll() ~drumedit() etc.) (p4.0.6 Tim)
 20.10.2010
       * Fixed: cmake should work now. (T356)
         - Changed the QT4_WRAP_UI3 macro to generate  <filename>.h  instead of  ui_<filename>.h
diff --git a/muse2/cmake/Summary.cmake b/muse2/cmake/Summary.cmake
new file mode 100644
index 00000000..2dc94eb2
--- /dev/null
+++ b/muse2/cmake/Summary.cmake
@@ -0,0 +1,28 @@
+set(summary_willbuild "")
+set(summary_willnotbuild "")
+
+macro(summary_add name test)
+  if (${test})
+    list(APPEND summary_willbuild ${name})
+  else (${test})
+    list(APPEND summary_willnotbuild "${name}")
+  endif (${test})
+endmacro(summary_add)
+
+macro(summary_show_part variable title)
+  list(LENGTH ${variable} _len)
+  if (_len)
+    message("")
+    message(${title})
+    message("-----------------------------------------------")
+    foreach (_item ${${variable}})
+      message("   ${_item}")
+    endforeach (_item)
+  endif (_len)
+endmacro(summary_show_part)
+
+macro(summary_show)
+  summary_show_part(summary_willbuild "The following components will be built:")
+  summary_show_part(summary_willnotbuild "The following components WILL NOT be built:")
+  message("")
+endmacro(summary_show)
diff --git a/muse2/cmake/cmake_uninstall.cmake.in b/muse2/cmake/cmake_uninstall.cmake.in
index c8ff0b7e..7e6f6cc0 100644
--- a/muse2/cmake/cmake_uninstall.cmake.in
+++ b/muse2/cmake/cmake_uninstall.cmake.in
@@ -2,21 +2,22 @@ IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
   MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
 ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
 
+SET(DESTDIR $ENV{DESTDIR})
 FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
 STRING(REGEX REPLACE "\n" ";" files "${files}")
 FOREACH(file ${files})
-  MESSAGE(STATUS "Uninstalling \"${file}\"")
-  IF(EXISTS "${file}")
+  MESSAGE(STATUS "Uninstalling \"${DESTDIR}${file}\"")
+  IF(EXISTS "${DESTDIR}${file}")
     EXEC_PROGRAM(
-      "@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
+      "@CMAKE_COMMAND@" ARGS "-E remove \"${DESTDIR}${file}\""
       OUTPUT_VARIABLE rm_out
       RETURN_VALUE rm_retval
       )
     IF("${rm_retval}" STREQUAL 0)
     ELSE("${rm_retval}" STREQUAL 0)
-      MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
+      MESSAGE(FATAL_ERROR "Problem when removing \"${DESTDIR}${file}\"")
     ENDIF("${rm_retval}" STREQUAL 0)
-  ELSE(EXISTS "${file}")
-    MESSAGE(STATUS "File \"${file}\" does not exist.")
-  ENDIF(EXISTS "${file}")
+  ELSE(EXISTS "${DESTDIR}${file}")
+    MESSAGE(STATUS "File \"${DESTDIR}${file}\" does not exist.")
+  ENDIF(EXISTS "${DESTDIR}${file}")
 ENDFOREACH(file)
diff --git a/muse2/config.h.in b/muse2/config.h.in
index 74a504a1..15d78f8e 100644
--- a/muse2/config.h.in
+++ b/muse2/config.h.in
@@ -29,3 +29,4 @@
 #define INSTALL_NAME     "${MusE_INSTALL_NAME}"
 #define INSTPREFIX       "${CMAKE_INSTALL_PREFIX}"
 #define VERSION          "${MusE_VERSION_FULL}"
+#define PACKAGE_NAME      "MusE"
\ No newline at end of file
diff --git a/muse2/demos/CMakeLists.txt b/muse2/demos/CMakeLists.txt
new file mode 100644
index 00000000..ae6318d9
--- /dev/null
+++ b/muse2/demos/CMakeLists.txt
@@ -0,0 +1,22 @@
+#=============================================================================
+#  MusE
+#  Linux Music Editor
+#  $Id:$
+#
+#  Copyright (C) 2002-2006 by Werner Schweer and others
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#=============================================================================
+
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/demos .*\\.med )
+
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}
diff --git a/muse2/packaging/CMakeLists.txt b/muse2/packaging/CMakeLists.txt
new file mode 100644
index 00000000..e49b38ce
--- /dev/null
+++ b/muse2/packaging/CMakeLists.txt
@@ -0,0 +1,22 @@
+#=============================================================================
+#  MusE
+#  Linux Music Editor
+#  $Id:$
+#
+#  Copyright (C) 2002-2006 by Werner Schweer and others
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#=============================================================================
+
+install_files ( /${SHARE_INSTALL_PREFIX}/icons/hicolor/64x64/apps/ muse_icon.png)
+install_files ( /${SHARE_INSTALL_PREFIX}/applications/ muse.desktop)
diff --git a/muse2/plugins/doublechorus/CMakeLists.txt b/muse2/plugins/doublechorus/CMakeLists.txt
index ecb6dbe0..35d2c42b 100644
--- a/muse2/plugins/doublechorus/CMakeLists.txt
+++ b/muse2/plugins/doublechorus/CMakeLists.txt
@@ -30,4 +30,4 @@ set_target_properties (doublechorus
       #COMPILE_FLAGS "-O3"
       )
 
-install_targets ( /lib/${MusE_INSTALL_NAME}/plugins doublechorus)
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/plugins doublechorus)
diff --git a/muse2/plugins/freeverb/CMakeLists.txt b/muse2/plugins/freeverb/CMakeLists.txt
index 0a86454f..9083099c 100644
--- a/muse2/plugins/freeverb/CMakeLists.txt
+++ b/muse2/plugins/freeverb/CMakeLists.txt
@@ -30,4 +30,4 @@ set_target_properties (freeverb
       COMPILE_FLAGS "-O2"
       )
 
-install_targets ( /lib/${MusE_INSTALL_NAME}/plugins freeverb)
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/plugins freeverb)
diff --git a/muse2/plugins/pandelay/CMakeLists.txt b/muse2/plugins/pandelay/CMakeLists.txt
index 5ebb08a0..6e48a9ea 100644
--- a/muse2/plugins/pandelay/CMakeLists.txt
+++ b/muse2/plugins/pandelay/CMakeLists.txt
@@ -30,4 +30,4 @@ set_target_properties (pandelay
       #COMPILE_FLAGS "-O3"
       )
 
-install_targets ( /lib/${MusE_INSTALL_NAME}/plugins pandelay)
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/plugins pandelay)
diff --git a/muse2/share/drummaps/CMakeLists.txt b/muse2/share/drummaps/CMakeLists.txt
index 965ddac6..45d5de36 100644
--- a/muse2/share/drummaps/CMakeLists.txt
+++ b/muse2/share/drummaps/CMakeLists.txt
@@ -18,5 +18,5 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-install_files( /share/${MusE_INSTALL_NAME}/drummaps .*\\.map )
+install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/drummaps .*\\.map )
 
diff --git a/muse2/share/html/CMakeLists.txt b/muse2/share/html/CMakeLists.txt
index e1a4f965..f737d3d5 100644
--- a/muse2/share/html/CMakeLists.txt
+++ b/muse2/share/html/CMakeLists.txt
@@ -19,10 +19,10 @@
 #=============================================================================
 
 # FIXME: Won't work.
-#install_files( /share/${MusE_INSTALL_NAME}/html .*\\.html .*\\.txt .*\\.jpg )  
+#install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/html .*\\.html .*\\.txt .*\\.jpg )  
 
-install_files( /share/${MusE_INSTALL_NAME}/html .*\\.html )  
-install_files( /share/${MusE_INSTALL_NAME}/html .*\\.jpg )  
+install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/html .*\\.html )  
+install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/html .*\\.jpg )  
 # FIXME: Installs CMakeLists.txt !!!
-install_files( /share/${MusE_INSTALL_NAME}/html .*\\.txt )  
+install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/html .*\\.txt )  
 
diff --git a/muse2/share/instruments/CMakeLists.txt b/muse2/share/instruments/CMakeLists.txt
index 64eb89ac..ec1e45dd 100644
--- a/muse2/share/instruments/CMakeLists.txt
+++ b/muse2/share/instruments/CMakeLists.txt
@@ -18,5 +18,5 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-install_files( /share/${MusE_INSTALL_NAME}/instruments .*\\.idf )
+install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/instruments .*\\.idf )
 
diff --git a/muse2/share/locale/CMakeLists.txt b/muse2/share/locale/CMakeLists.txt
index 76aa7660..c7c1c86c 100644
--- a/muse2/share/locale/CMakeLists.txt
+++ b/muse2/share/locale/CMakeLists.txt
@@ -18,4 +18,4 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-install_files( /share/${MusE_INSTALL_NAME}/locale .*\\.qm )
+install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/locale .*\\.qm )
diff --git a/muse2/share/plugins/CMakeLists.txt b/muse2/share/plugins/CMakeLists.txt
index 4df55561..1c6cc72c 100644
--- a/muse2/share/plugins/CMakeLists.txt
+++ b/muse2/share/plugins/CMakeLists.txt
@@ -18,5 +18,5 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-install_files ( /share/${MusE_INSTALL_NAME}/plugins .*\\.ui )
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/plugins .*\\.ui )
 
diff --git a/muse2/share/pybridge/CMakeLists.txt b/muse2/share/pybridge/CMakeLists.txt
index d38f1c60..30c455aa 100644
--- a/muse2/share/pybridge/CMakeLists.txt
+++ b/muse2/share/pybridge/CMakeLists.txt
@@ -18,5 +18,5 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-install_files( /share/${MusE_INSTALL_NAME}/pybridge .*\\.py )
+install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/pybridge .*\\.py )
 
diff --git a/muse2/share/scripts/CMakeLists.txt b/muse2/share/scripts/CMakeLists.txt
index 27046121..0be0850e 100644
--- a/muse2/share/scripts/CMakeLists.txt
+++ b/muse2/share/scripts/CMakeLists.txt
@@ -19,10 +19,10 @@
 #=============================================================================
 
 # FIXME: Won't work
-#install_files( /share/${MusE_INSTALL_NAME}/scripts DoNothing RemoveShortEvents DoubleSpeed ConstantLength SwingQuantize1 )
+#install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/scripts DoNothing RemoveShortEvents DoubleSpeed ConstantLength SwingQuantize1 )
 
-install_files( /share/${MusE_INSTALL_NAME}/scripts DoNothing )
-install_files( /share/${MusE_INSTALL_NAME}/scripts RemoveShortEvents )
-install_files( /share/${MusE_INSTALL_NAME}/scripts DoubleSpeed )
-install_files( /share/${MusE_INSTALL_NAME}/scripts ConstantLength )
-install_files( /share/${MusE_INSTALL_NAME}/scripts SwingQuantize1 )
+install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/scripts DoNothing )
+install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/scripts RemoveShortEvents )
+install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/scripts DoubleSpeed )
+install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/scripts ConstantLength )
+install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/scripts SwingQuantize1 )
diff --git a/muse2/share/templates/CMakeLists.txt b/muse2/share/templates/CMakeLists.txt
index 92defd5c..bf047ce7 100644
--- a/muse2/share/templates/CMakeLists.txt
+++ b/muse2/share/templates/CMakeLists.txt
@@ -18,7 +18,7 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-install_files ( /share/${MusE_INSTALL_NAME}/templates .*\\.med
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/templates .*\\.med
 #    audio.med
 #    # empty.med 
 #    default.med
diff --git a/muse2/share/wallpapers/CMakeLists.txt b/muse2/share/wallpapers/CMakeLists.txt
index f098c244..219010cb 100644
--- a/muse2/share/wallpapers/CMakeLists.txt
+++ b/muse2/share/wallpapers/CMakeLists.txt
@@ -18,5 +18,5 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-install_files ( /share/${MusE_INSTALL_NAME}/wallpapers .*\\.gif )
-install_files ( /share/${MusE_INSTALL_NAME}/wallpapers .*\\.jpg )
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/wallpapers .*\\.gif )
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/wallpapers .*\\.jpg )
diff --git a/muse2/synti/CMakeLists.txt b/muse2/synti/CMakeLists.txt
index ee358879..b2bc87ea 100644
--- a/muse2/synti/CMakeLists.txt
+++ b/muse2/synti/CMakeLists.txt
@@ -30,9 +30,9 @@ include_directories(
 # set (SubDirs libsynti s1 organ deicsonze deicsonze2 simpledrums vam)
 set (SubDirs libsynti s1 organ deicsonze simpledrums vam)
 
-if (ENABLE_FLUID)
+if (HAVE_FLUIDSYNTH)
       set (SubDirs ${SubDirs} fluid fluidsynth )
-endif (ENABLE_FLUID)
+endif (HAVE_FLUIDSYNTH)
 
 subdirs(${SubDirs})
 
diff --git a/muse2/synti/deicsonze/CMakeLists.txt b/muse2/synti/deicsonze/CMakeLists.txt
index 2d9ddfbf..e705e0ae 100644
--- a/muse2/synti/deicsonze/CMakeLists.txt
+++ b/muse2/synti/deicsonze/CMakeLists.txt
@@ -58,6 +58,6 @@ target_link_libraries(deicsonze
 
 install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ deicsonze )
 
-# install_files ( /share/${MusE_INSTALL_NAME}/presets/deicsonze SutulaBank.dei )
-install_files ( /share/${MusE_INSTALL_NAME}/presets/deicsonze ARCH_ALIN )
-install_files ( /share/${MusE_INSTALL_NAME}/presets/deicsonze README )
+# install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/presets/deicsonze SutulaBank.dei )
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/presets/deicsonze ARCH_ALIN )
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/presets/deicsonze README )
diff --git a/muse2/synti/deicsonze2/CMakeLists.txt b/muse2/synti/deicsonze2/CMakeLists.txt
index 98457f5c..430953ca 100644
--- a/muse2/synti/deicsonze2/CMakeLists.txt
+++ b/muse2/synti/deicsonze2/CMakeLists.txt
@@ -56,4 +56,4 @@ target_link_libraries(deicsonze
 
 install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ deicsonze )
 
-install_files ( /share/${MusE_INSTALL_NAME}/presets/deicsonze SutulaBank.dei )
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/presets/deicsonze SutulaBank.dei )
diff --git a/muse2/synti/fluid/CMakeLists.txt b/muse2/synti/fluid/CMakeLists.txt
index 81cf1e18..82bc6e5f 100644
--- a/muse2/synti/fluid/CMakeLists.txt
+++ b/muse2/synti/fluid/CMakeLists.txt
@@ -39,12 +39,12 @@ target_link_libraries( fluid synti )
 set_target_properties ( fluid
    PROPERTIES PREFIX ""
    COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h"
-   LINK_FLAGS "-L${FLUID_LIBDIR} ${FLUID_LIB}"
+   LINK_FLAGS "${FLUID_LIBRARIES}"
    )
 target_link_libraries(fluid
       synti
       ${QT_LIBRARIES}
-      ${FLUID_LIB}
+      ${FLUID_LIBRARIES}
       )
 
 install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ fluid )
diff --git a/muse2/synti/fluidsynth/CMakeLists.txt b/muse2/synti/fluidsynth/CMakeLists.txt
index 7efa53d6..1a10ba06 100644
--- a/muse2/synti/fluidsynth/CMakeLists.txt
+++ b/muse2/synti/fluidsynth/CMakeLists.txt
@@ -39,13 +39,13 @@ target_link_libraries( fluidsynth synti )
 set_target_properties ( fluidsynth 
    PROPERTIES PREFIX ""
    COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h"
-   LINK_FLAGS "-L${FLUID_LIBDIR} ${FLUID_LIB}"
+   LINK_FLAGS "${FLUID_LIBRARIES}"
    )
 
 target_link_libraries(fluidsynth
       synti
       ${QT_LIBRARIES}
-      ${FLUID_LIB}
+      ${FLUID_LIBRARIES}
       )
 
 install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ fluidsynth )
@@ -53,5 +53,5 @@ install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ fluidsyn
 # FIXME: Won't work
 # install_files ( /${MusE_INSTALL_NAME}/synthi TODO README.txt )
 
-install_files ( /share/${MusE_INSTALL_NAME}/synthi TODO )
-install_files ( /share/${MusE_INSTALL_NAME}/synthi README.txt )
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/synthi TODO )
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/synthi README.txt )
diff --git a/muse2/utils/CMakeLists.txt b/muse2/utils/CMakeLists.txt
new file mode 100644
index 00000000..8d2b018f
--- /dev/null
+++ b/muse2/utils/CMakeLists.txt
@@ -0,0 +1,22 @@
+#=============================================================================
+#  MusE
+#  Linux Music Editor
+#  $Id:$
+#
+#  Copyright (C) 2002-2006 by Werner Schweer and others
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#=============================================================================
+
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/utils/ muse-find-unused-wavs)
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/utils/ muse-song-convert.py)