From be2724fc7471d4459214603d0cba680b6f0b1b15 Mon Sep 17 00:00:00 2001
From: "Tim E. Real" <termtech@rogers.com>
Date: Wed, 20 Oct 2010 22:05:43 +0000
Subject: See ChangeLog

---
 muse2/ChangeLog                    | 5 +++++
 muse2/muse/CMakeLists.txt          | 6 ++++--
 muse2/muse/arranger/CMakeLists.txt | 5 -----
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'muse2')

diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 09b493c6..d6204c68 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,8 @@
+20.10.2010
+      * Fixed: cmake should work now. (T356)
+        - Changed the QT4_WRAP_UI3 macro to generate  <filename>.h  instead of  ui_<filename>.h
+        - In /muse/CMakeLists.txt, included all the uic generated headers paths (the 'build' paths). 
+        - Tested OK with fresh svn pull.
 19.10.2010
       * Fixed: Some missing files, errors with cmake build. (T356)
 19.10.2010
diff --git a/muse2/muse/CMakeLists.txt b/muse2/muse/CMakeLists.txt
index b47fffef..bc67203b 100644
--- a/muse2/muse/CMakeLists.txt
+++ b/muse2/muse/CMakeLists.txt
@@ -287,9 +287,11 @@ EXEC_PROGRAM( svnversion
 # add_definitions ( -DINSTLIBDIR=${LIBRARY_OUTPUT_DIRECTORY} )
 include_directories (midiedit arranger liste widgets mixer driver waveedit mplugins instruments remote)
 
-# For some reason this was needed to find routedialogbase.h.
+# Make sure to include the uic generated headers paths.
 include_directories(
-      ${CMAKE_CURRENT_BINARY_DIR}/mixer
+      ${CMAKE_CURRENT_BINARY_DIR}/midiedit ${CMAKE_CURRENT_BINARY_DIR}/arranger ${CMAKE_CURRENT_BINARY_DIR}/liste ${CMAKE_CURRENT_BINARY_DIR}/widgets 
+      ${CMAKE_CURRENT_BINARY_DIR}/mixer ${CMAKE_CURRENT_BINARY_DIR}/driver ${CMAKE_CURRENT_BINARY_DIR}/waveedit ${CMAKE_CURRENT_BINARY_DIR}/mplugins 
+      ${CMAKE_CURRENT_BINARY_DIR}/instruments ${CMAKE_CURRENT_BINARY_DIR}/remote
       )
 
 set_target_properties( muse
diff --git a/muse2/muse/arranger/CMakeLists.txt b/muse2/muse/arranger/CMakeLists.txt
index 130f4db1..c838c86b 100644
--- a/muse2/muse/arranger/CMakeLists.txt
+++ b/muse2/muse/arranger/CMakeLists.txt
@@ -40,11 +40,6 @@ add_library ( arranger STATIC
       # ${arranger_ui_headers}
       )
 
-# For some reason this was needed to find routedialogbase.h.
-include_directories(
-      ${CMAKE_CURRENT_BINARY_DIR}/../mixer
-      )
-
 set_target_properties( arranger
   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
   )
-- 
cgit v1.2.3