Major cmake cleanup. Please see the ChangeLog.

10 files changed, 69 insertions, 36 deletions

diff --git a/muse2/share/CMakeLists.txt b/muse2/share/CMakeLists.txt
index bb923315..817e2910 100644
--- a/muse2/share/CMakeLists.txt
+++ b/muse2/share/CMakeLists.txt
@@ -18,6 +18,15 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-subdirs( drummaps html instruments locale plugins pybridge scripts templates wallpapers)
-# subdirs( drummaps instruments locale plugins pybridge scripts templates wallpapers)
+subdirs(
+      drummaps
+      html
+      instruments
+      locale
+      plugins
+      pybridge
+      scripts
+      templates
+      wallpapers
+      )
 
diff --git a/muse2/share/drummaps/CMakeLists.txt b/muse2/share/drummaps/CMakeLists.txt
index 45d5de36..92af890a 100644
--- a/muse2/share/drummaps/CMakeLists.txt
+++ b/muse2/share/drummaps/CMakeLists.txt
@@ -18,5 +18,9 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/drummaps .*\\.map )
+file (GLOB drummaps_files *.map)
+
+install( FILES ${drummaps_files}
+      DESTINATION ${MusE_SHARE_DIR}/drummaps
+      )
 
diff --git a/muse2/share/html/CMakeLists.txt b/muse2/share/html/CMakeLists.txt
index f737d3d5..e771637a 100644
--- a/muse2/share/html/CMakeLists.txt
+++ b/muse2/share/html/CMakeLists.txt
@@ -18,11 +18,13 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-# FIXME: Won't work.
-#install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/html .*\\.html .*\\.txt .*\\.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_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/html .*\\.txt )  
+file (GLOB html_files
+      *.css
+      *.html
+      *.jpg
+      toc_.txt
+      )
 
+install( FILES ${html_files}
+      DESTINATION ${MusE_DOC_DIR}/html
+      )
diff --git a/muse2/share/instruments/CMakeLists.txt b/muse2/share/instruments/CMakeLists.txt
index ec1e45dd..5338d7b3 100644
--- a/muse2/share/instruments/CMakeLists.txt
+++ b/muse2/share/instruments/CMakeLists.txt
@@ -18,5 +18,9 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/instruments .*\\.idf )
+file (GLOB instruments_files *.idf)
+
+install( FILES ${instruments_files}
+      DESTINATION ${MusE_SHARE_DIR}/instruments
+      )
 
diff --git a/muse2/share/locale/CMakeLists.txt b/muse2/share/locale/CMakeLists.txt
index 454ed830..112cd56b 100644
--- a/muse2/share/locale/CMakeLists.txt
+++ b/muse2/share/locale/CMakeLists.txt
@@ -59,6 +59,6 @@ if (UPDATE_TRANSLATIONS)
             )
 endif (UPDATE_TRANSLATIONS)
 
-#install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/locale .*\\.qm )
-install(FILES ${QM_FILES} DESTINATION
-      ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/locale)
+install(FILES ${QM_FILES}
+      DESTINATION ${MusE_SHARE_DIR}/locale
+      )
diff --git a/muse2/share/plugins/CMakeLists.txt b/muse2/share/plugins/CMakeLists.txt
index 6499c28b..9aa4b92c 100644
--- a/muse2/share/plugins/CMakeLists.txt
+++ b/muse2/share/plugins/CMakeLists.txt
@@ -18,8 +18,15 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-file (GLOB UI_FILES *.ui)
-set (FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${UI_FILES} CACHE INTERNAL "")
+file (GLOB plugins_ui_files *.ui)
 
-install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/plugins .*\\.ui )
+set (FILES_TO_TRANSLATE 
+      ${FILES_TO_TRANSLATE}
+      ${plugins_ui_files}
+      CACHE INTERNAL ""
+      )
+
+install( FILES ${plugins_ui_files}
+      DESTINATION ${MusE_SHARE_DIR}/plugins
+      )
 
diff --git a/muse2/share/pybridge/CMakeLists.txt b/muse2/share/pybridge/CMakeLists.txt
index 30c455aa..bee3a0d0 100644
--- a/muse2/share/pybridge/CMakeLists.txt
+++ b/muse2/share/pybridge/CMakeLists.txt
@@ -18,5 +18,9 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-install_files( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/pybridge .*\\.py )
+file (GLOB pybridge_files *.py)
+
+install( FILES ${pybridge_files}
+      DESTINATION ${MusE_SHARE_DIR}/pybridge
+      )
 
diff --git a/muse2/share/scripts/CMakeLists.txt b/muse2/share/scripts/CMakeLists.txt
index 3fc898d1..5a7be7db 100644
--- a/muse2/share/scripts/CMakeLists.txt
+++ b/muse2/share/scripts/CMakeLists.txt
@@ -18,12 +18,15 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-file(GLOB script_files DoNothing 
-                       RemoveShortEvents 
-                       DoubleSpeed 
-                       ConstantLength 
-                       SwingQuantize1
-    )
+file(GLOB script_files
+      DoNothing 
+      RemoveShortEvents 
+      DoubleSpeed 
+      ConstantLength 
+      SwingQuantize1
+      )
+
 install (PROGRAMS ${script_files}
-         DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/scripts)
+      DESTINATION ${MusE_SHARE_DIR}/scripts
+      )
 
diff --git a/muse2/share/templates/CMakeLists.txt b/muse2/share/templates/CMakeLists.txt
index bf047ce7..3bdb6d8a 100644
--- a/muse2/share/templates/CMakeLists.txt
+++ b/muse2/share/templates/CMakeLists.txt
@@ -18,13 +18,9 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/templates .*\\.med
-#    audio.med
-#    # empty.med 
-#    default.med
-#    midiGM.med
-#    monorecord.med
-#    synti.med 
-#    # ns5r.med
-   )
+file (GLOB templates_files *.med)
+
+install( FILES ${templates_files}
+      DESTINATION ${MusE_SHARE_DIR}/templates
+      )
 
diff --git a/muse2/share/wallpapers/CMakeLists.txt b/muse2/share/wallpapers/CMakeLists.txt
index 219010cb..a4332ec5 100644
--- a/muse2/share/wallpapers/CMakeLists.txt
+++ b/muse2/share/wallpapers/CMakeLists.txt
@@ -18,5 +18,9 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/wallpapers .*\\.gif )
-install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/wallpapers .*\\.jpg )
+file (GLOB wallpapers_files *.gif *.jpg)
+
+install( FILES ${wallpapers_files}
+      DESTINATION ${MusE_SHARE_DIR}/wallpapers
+      )
+