Fix cmake dependencies

admin

@@ -1 +1 @@
-Subproject commit 26d642b2620397b76d5fbb64a9ef5ca8f2334f72
+Subproject commit 21cb4a9d2a0e083b10dee6d22958c4f58de6c5b2

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 )
@@ -156,6 +156,15 @@ if( WANT_TEST )
     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)
     ADD_TEST(test/${TestName} RosegardenTestDriver test/${TestName})