diff options
| -rw-r--r-- | muse2/cmake/QtWrapMacros.cmake | 3 | ||||
| -rw-r--r-- | muse2/muse/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | muse2/muse/arranger/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | muse2/muse/mixer/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | muse2/muse/widgets/CMakeLists.txt | 6 |
5 files changed, 18 insertions, 6 deletions
diff --git a/muse2/cmake/QtWrapMacros.cmake b/muse2/cmake/QtWrapMacros.cmake index 662cabae..c2d1cbab 100644 --- a/muse2/cmake/QtWrapMacros.cmake +++ b/muse2/cmake/QtWrapMacros.cmake @@ -10,7 +10,8 @@ FOREACH (it ${ui_files}) GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) - SET(outfile_h ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h) + # SET(outfile_h ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h) + SET(outfile_h ${CMAKE_CURRENT_BINARY_DIR}/${outfile}.h) SET(outfile_cpp ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.cpp) ADD_CUSTOM_COMMAND(OUTPUT ${outfile_h} ${outfile_cpp} COMMAND ${QT_UIC3_EXECUTABLE} diff --git a/muse2/muse/CMakeLists.txt b/muse2/muse/CMakeLists.txt index bb7947d7..b47fffef 100644 --- a/muse2/muse/CMakeLists.txt +++ b/muse2/muse/CMakeLists.txt @@ -287,6 +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. +include_directories( + ${CMAKE_CURRENT_BINARY_DIR}/mixer + ) + set_target_properties( muse # PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h" # PROPERTIES COMPILE_FLAGS "-Imidiedit -Iarranger -Iliste -Iwidgets -Imixer -Idriver -Iwaveedit -Implugins -Iinstruments -Iremote ${PYREM_CPP_FLAGS} -DSVNVERSION='\"${SVNVER}\"' -include ${PROJECT_BINARY_DIR}/all.h " diff --git a/muse2/muse/arranger/CMakeLists.txt b/muse2/muse/arranger/CMakeLists.txt index 7da35146..130f4db1 100644 --- a/muse2/muse/arranger/CMakeLists.txt +++ b/muse2/muse/arranger/CMakeLists.txt @@ -39,6 +39,12 @@ add_library ( arranger STATIC ${arranger_mocs} # ${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" ) diff --git a/muse2/muse/mixer/CMakeLists.txt b/muse2/muse/mixer/CMakeLists.txt index fb5c15cf..f2d4b012 100644 --- a/muse2/muse/mixer/CMakeLists.txt +++ b/muse2/muse/mixer/CMakeLists.txt @@ -23,6 +23,8 @@ QT4_WRAP_CPP ( mixer_mocs amixer.h strip.h astrip.h mstrip.h meter.h rack.h pank QT4_WRAP_UI3 ( mixer_uis routedialogbase.ui ) add_library ( mixer STATIC + ${mixer_mocs} + ${mixer_uis} amixer.cpp meter.cpp rack.cpp @@ -30,8 +32,6 @@ add_library ( mixer STATIC auxknob.cpp routedialog.cpp strip.cpp astrip.cpp mstrip.cpp - ${mixer_mocs} - ${mixer_uis} ) set_target_properties ( mixer diff --git a/muse2/muse/widgets/CMakeLists.txt b/muse2/muse/widgets/CMakeLists.txt index 66bfc2f9..b9ce1e55 100644 --- a/muse2/muse/widgets/CMakeLists.txt +++ b/muse2/muse/widgets/CMakeLists.txt @@ -125,9 +125,9 @@ QT4_WRAP_CPP (widget_mocs shortcutcapturedialog.h combobox.h aboutbox_impl.h - aboutbox.h - songinfo.h - didyouknow.h + # aboutbox.h + # songinfo.h + # didyouknow.h checkbox.h vscale.h action.h |