diff options
| -rw-r--r-- | muse/CMakeLists.txt | 11 | ||||
| -rwxr-xr-x | muse/gen | 3 | ||||
| -rw-r--r-- | muse/midiplugins/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | muse/muse/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | muse/muse/widgets/CMakeLists.txt | 15 |
5 files changed, 29 insertions, 6 deletions
diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt index bddd7172..63b7fc8a 100644 --- a/muse/CMakeLists.txt +++ b/muse/CMakeLists.txt @@ -19,6 +19,11 @@ #============================================================================= project(muse) +CMAKE_MINIMUM_REQUIRED(VERSION 2.4.1) +set(CMAKE_VERBOSE_MAKEFILE ON) +set(CMAKE_INCLUDE_CURRENT_DIR TRUE) +set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) +set(CMAKE_SKIP_RULE_DEPENDENCY TRUE) # The MusE version number. SET(MusE_VERSION_MAJOR 1) @@ -184,10 +189,14 @@ subdirs(al awl grepmidi plugins midiplugins synti muse share doc) include_directories( . - ${CMAKE_CURRENT_BINARY} ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/muse ${PROJECT_SOURCE_DIR}/muse/widgets + ${PROJECT_BINARY_DIR}/muse + ${PROJECT_BINARY_DIR}/muse/widgets + ${PROJECT_BINARY_DIR}/muse/instruments + ${PROJECT_BINARY_DIR}/muse/ctrl + ${ALSA_INCDIR} ${JACK_INCDIR} ${SNDFILE_INCDIR} @@ -21,6 +21,9 @@ if test ! -d build; cd build fi +# ahem... hack +cp ../all.h . + echo "+start top level make..." make diff --git a/muse/midiplugins/CMakeLists.txt b/muse/midiplugins/CMakeLists.txt index a2894e6c..7ef43a45 100644 --- a/muse/midiplugins/CMakeLists.txt +++ b/muse/midiplugins/CMakeLists.txt @@ -21,7 +21,7 @@ subdirs(libmidiplugin filter metronom transform ) set ( CMAKE_CXX_FLAGS - "${CMAKE_CXX_FLAGS} -DQT_NO_DEBUG -DQT_PLUGIN -DQT_SHARED" + "${CMAKE_CXX_FLAGS} -DQT_NO_DEBUG -DQT_PLUGIN -DQT_SHARED -fPIC" ) set ( CMAKE_LDD_FLAGS -module -avoid-version ) diff --git a/muse/muse/CMakeLists.txt b/muse/muse/CMakeLists.txt index 37a0c404..64ff6da7 100644 --- a/muse/muse/CMakeLists.txt +++ b/muse/muse/CMakeLists.txt @@ -18,6 +18,10 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #============================================================================= +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ) + MACRO(WRAP_CPP outfiles ) FOREACH(it ${ARGN}) SET(${outfiles} ${${outfiles}} ${it}.cpp) diff --git a/muse/muse/widgets/CMakeLists.txt b/muse/muse/widgets/CMakeLists.txt index 268fe74b..9c0810eb 100644 --- a/muse/muse/widgets/CMakeLists.txt +++ b/muse/muse/widgets/CMakeLists.txt @@ -51,7 +51,18 @@ QT4_WRAP_UI (widget_ui_headers velocity.ui ) +# ADD_CUSTOM_COMMAND(OUTPUT ui_midisync.h +# COMMAND ${QT_UIC_EXECUTABLE} +# ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/ui_midisync.h ${CMAKE_CURRENT_SOURCE_DIR}/midisync.ui +# DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/midisync.ui +# ) + +# ADD_FILE_DEPENDENCIES(moc_midisync.cxx ${CMAKE_CURRENT_BINARY_DIR}/ui_midisync.h) + add_library ( widgets STATIC + ${widget_ui_headers} + ${widget_mocs} + utils.cpp shortcutconfig.cpp shortcutcapturedialog.cpp @@ -61,7 +72,6 @@ add_library ( widgets STATIC velocity.cpp gatetime.cpp tools.cpp - doublelabel.cpp noteinfo.cpp dentry.cpp @@ -74,9 +84,6 @@ add_library ( widgets STATIC outportcombo.cpp splitter.cpp quantcombo.cpp rastercombo.cpp comboQuant.cpp bigtime.cpp - - ${widget_mocs} - ${widget_ui_headers} ) set_target_properties( widgets |