diff options
| author | Timothy Pearson <[email protected]> | 2011-11-28 11:12:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-11-28 11:12:54 -0600 |
| commit | f38a30443ea70eabc1117bde75e778a091e4de0a (patch) | |
| tree | b9ba4d647a85204450c067ada0884a9ee07fddc4 | |
| parent | d3b27721e6e46833e2c12080cdd64f1bcf04f543 (diff) | |
| download | rosegarden-f38a30443ea70eabc1117bde75e778a091e4de0a.tar.gz rosegarden-f38a30443ea70eabc1117bde75e778a091e4de0a.zip | |
Fix cmake dependencies
| m--------- | admin | 0 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 29 |
2 files changed, 19 insertions, 10 deletions
diff --git a/admin b/admin -Subproject 26d642b2620397b76d5fbb64a9ef5ca8f2334f7 +Subproject 21cb4a9d2a0e083b10dee6d22958c4f58de6c5b diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4fb273f..9e7701f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -94,7 +94,7 @@ tde_add_executable( rosegardensequencer AUTOMOC DESTINATION ${BIN_INSTALL_DIR} ) -ADD_DEPENDENCIES(rosegardensequencer RosegardenCommon) +ADD_DEPENDENCIES(rosegardensequencer RosegardenCommon-static) ##### RosegardenExtended ############################ @@ -131,14 +131,14 @@ tde_add_executable( rosegarden AUTOMOC DESTINATION ${BIN_INSTALL_DIR} ) -ADD_DEPENDENCIES(rosegarden RosegardenExtended) -ADD_DEPENDENCIES(rosegarden RosegardenSegmentCanvas) -ADD_DEPENDENCIES(rosegarden RosegardenCommands) -ADD_DEPENDENCIES(rosegarden RosegardenCommon) -ADD_DEPENDENCIES(rosegarden RosegardenExtended) -ADD_DEPENDENCIES(rosegarden RosegardenSegmentCanvas) -ADD_DEPENDENCIES(rosegarden RosegardenCommands) -ADD_DEPENDENCIES(rosegarden RosegardenCommon) +ADD_DEPENDENCIES(rosegarden RosegardenExtended-static) +ADD_DEPENDENCIES(rosegarden RosegardenSegmentCanvas-static) +ADD_DEPENDENCIES(rosegarden RosegardenCommands-static) +ADD_DEPENDENCIES(rosegarden RosegardenCommon-static) +ADD_DEPENDENCIES(rosegarden RosegardenExtended-static) +ADD_DEPENDENCIES(rosegarden RosegardenSegmentCanvas-static) +ADD_DEPENDENCIES(rosegarden RosegardenCommands-static) +ADD_DEPENDENCIES(rosegarden RosegardenCommon-static) if( WANT_TEST ) include( TestFileList.txt ) @@ -154,7 +154,16 @@ if( WANT_TEST ) SOURCES RosegardenTestDriver.cpp ${tests_SRCS} LINK dl lo tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} kio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon DESTINATION ${BIN_INSTALL_DIR} -) + ) + + ADD_DEPENDENCIES(RosegardenTestDriver RosegardenExtended-static) + ADD_DEPENDENCIES(RosegardenTestDriver RosegardenSegmentCanvas-static) + ADD_DEPENDENCIES(RosegardenTestDriver RosegardenCommands-static) + ADD_DEPENDENCIES(RosegardenTestDriver RosegardenCommon-static) + ADD_DEPENDENCIES(RosegardenTestDriver RosegardenExtended-static) + ADD_DEPENDENCIES(RosegardenTestDriver RosegardenSegmentCanvas-static) + ADD_DEPENDENCIES(RosegardenTestDriver RosegardenCommands-static) + ADD_DEPENDENCIES(RosegardenTestDriver RosegardenCommon-static) FOREACH(currenttest ${tests_SRCS}) GET_FILENAME_COMPONENT(TestName ${currenttest} NAME_WE) |