[Scstudio-commits] SF.net SVN: scstudio:[257] trunk

[<koc...@us...>]

Revision: 257
          http://scstudio.svn.sourceforge.net/scstudio/?rev=257&view=rev
Author:   kocianon
Date:     2009-07-05 21:55:09 +0000 (Sun, 05 Jul 2009)

Log Message:
-----------
scstime library fix

Modified Paths:
--------------
    trunk/src/check/time/CMakeLists.txt
    trunk/src/data/CMakeLists.txt
    trunk/tests/CMakeLists.txt

Modified: trunk/src/check/time/CMakeLists.txt
===================================================================
--- trunk/src/check/time/CMakeLists.txt	2009-07-05 16:44:41 UTC (rev 256)
+++ trunk/src/check/time/CMakeLists.txt	2009-07-05 21:55:09 UTC (rev 257)
@@ -1,4 +1,4 @@
-ADD_LIBRARY(sctimeconsistency SHARED
+ADD_LIBRARY(sctime SHARED
   time_consistency.cpp
   time_consistency.h
   bmsc_tightening.h 
@@ -8,8 +8,7 @@
   hmsc_tighten.cpp
 )
 
-TARGET_LINK_LIBRARIES(sctimeconsistency
+TARGET_LINK_LIBRARIES(sctime
   scmsc
-  sctime
 )
 

Modified: trunk/src/data/CMakeLists.txt
===================================================================
--- trunk/src/data/CMakeLists.txt	2009-07-05 16:44:41 UTC (rev 256)
+++ trunk/src/data/CMakeLists.txt	2009-07-05 21:55:09 UTC (rev 257)
@@ -1,12 +1,9 @@
-ADD_LIBRARY(sctime SHARED
-  time.cpp
-  time.h
-)
-
 ADD_LIBRARY(scmsc SHARED
   export.h
   msc_types.cpp
   msc_types.h
+  time.cpp
+  time.h
   strip_diacritics.cpp
   msc.cpp
   msc.h
@@ -32,9 +29,9 @@
   hmsc_reference_checker.h
 )
 
-TARGET_LINK_LIBRARIES(scmsc
-  sctime	
-)
+#TARGET_LINK_LIBRARIES(scmsc
+#  sctime	
+#)
 
 # build import-export formatters
 ADD_SUBDIRECTORY(engmann)

Modified: trunk/tests/CMakeLists.txt
===================================================================
--- trunk/tests/CMakeLists.txt	2009-07-05 16:44:41 UTC (rev 256)
+++ trunk/tests/CMakeLists.txt	2009-07-05 21:55:09 UTC (rev 257)
@@ -119,7 +119,7 @@
   interval_string.cpp
 )
 TARGET_LINK_LIBRARIES(interval_string
-  sctime
+  scmsc
 )
 
 ADD_TEST(decimal_test ${EXECUTABLE_OUTPUT_PATH}/decimal_test)
@@ -133,7 +133,7 @@
 
 TARGET_LINK_LIBRARIES(bmsc_matrix_converter_test
   scmsc
-  sctimeconsistency
+  sctime
   scpseudocode
 )
 
@@ -143,7 +143,7 @@
 
 TARGET_LINK_LIBRARIES(incon_test
   scmsc
-  sctimeconsistency
+  sctime
   scpseudocode
 )
 
@@ -153,7 +153,7 @@
 
 TARGET_LINK_LIBRARIES(tighten_msc_test
   scmsc
-  sctimeconsistency
+  sctime
 
   scpseudocode
 )
@@ -164,7 +164,7 @@
 
 TARGET_LINK_LIBRARIES(bmsc_tightening_test
   scmsc
-  sctimeconsistency
+  sctime
   scpseudocode
 )
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.