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

[<got...@us...>]

Revision: 259
          http://scstudio.svn.sourceforge.net/scstudio/?rev=259&view=rev
Author:   gotthardp
Date:     2009-07-06 09:43:03 +0000 (Mon, 06 Jul 2009)

Log Message:
-----------
Removed some link errors on Win32 platforms.

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

Modified: trunk/src/check/time/CMakeLists.txt
===================================================================
--- trunk/src/check/time/CMakeLists.txt	2009-07-06 07:12:18 UTC (rev 258)
+++ trunk/src/check/time/CMakeLists.txt	2009-07-06 09:43:03 UTC (rev 259)
@@ -10,5 +10,6 @@
 
 TARGET_LINK_LIBRARIES(sctime
   scmsc
+  scpseudocode
 )
 

Modified: trunk/src/check/time/time_consistency.h
===================================================================
--- trunk/src/check/time/time_consistency.h	2009-07-06 07:12:18 UTC (rev 258)
+++ trunk/src/check/time/time_consistency.h	2009-07-06 09:43:03 UTC (rev 259)
@@ -143,7 +143,7 @@
 };
 
 
-class FloydWarshall: 
+class SCTIME_EXPORT FloydWarshall: 
 public MscIntervalTightener,
 public MscIntervalConsistencyCheck
 {
@@ -160,7 +160,7 @@
   {}
 }; 
 
-class MscSolveTCSP
+class SCTIME_EXPORT MscSolveTCSP
 {
 private:
   MscIntervalTightener* tightener;
@@ -184,7 +184,7 @@
   IntervalSetMatrix solve(const IntervalSetMatrix& m);
 };
 
-class BmscMatrixConverter:public WhiteEventFoundListener
+class SCTIME_EXPORT BmscMatrixConverter:public WhiteEventFoundListener
 {
 private:
   // Vector of all events - event <-- matrix number 

Modified: trunk/src/data/time.h
===================================================================
--- trunk/src/data/time.h	2009-07-06 07:12:18 UTC (rev 258)
+++ trunk/src/data/time.h	2009-07-06 09:43:03 UTC (rev 259)
@@ -19,6 +19,8 @@
 #ifndef _TIME_H_
 #define _TIME_H_
 
+#include "data/export.h"
+
 #include<limits.h>
 #include<algorithm>
 #include<exception>
@@ -270,7 +272,7 @@
  * @brief class representing couple value-number and bracket
  */
 template<class T> 
-class MscIntervalCouple
+class SCMSC_EXPORT MscIntervalCouple
 {
 private:
   bool m_closed;
@@ -457,7 +459,7 @@
  * @brief class representing Interval
  */
 template<class T>
-class MscTimeInterval
+class SCMSC_EXPORT MscTimeInterval
 {
 private:
   MscIntervalCouple<T> m_begin;
@@ -812,7 +814,7 @@
  *  Keeping sorted list of intervals, dont have intersection
  */
 template<class T>
-class MscTimeIntervalSet
+class SCMSC_EXPORT MscTimeIntervalSet
 {
 private:
   typedef std::list< MscTimeInterval<T> > IntervalList;

Modified: trunk/tests/CMakeLists.txt
===================================================================
--- trunk/tests/CMakeLists.txt	2009-07-06 07:12:18 UTC (rev 258)
+++ trunk/tests/CMakeLists.txt	2009-07-06 09:43:03 UTC (rev 259)
@@ -108,12 +108,23 @@
 ADD_EXECUTABLE(decimal_test
   decimal_test.cpp
 )
+TARGET_LINK_LIBRARIES(decimal_test
+  scmsc
+)
+
 ADD_EXECUTABLE(interval_test
   interval_test.cpp
 )
+TARGET_LINK_LIBRARIES(interval_test
+  scmsc
+)
+
 ADD_EXECUTABLE(interval_set_test
   interval_set_test.cpp
 )
+TARGET_LINK_LIBRARIES(interval_set_test
+  scmsc
+)
 
 ADD_EXECUTABLE(interval_string
   interval_string.cpp
@@ -130,7 +141,6 @@
 ADD_EXECUTABLE(bmsc_matrix_converter_test
   bmsc_matrix_converter_test.cpp
 )
-
 TARGET_LINK_LIBRARIES(bmsc_matrix_converter_test
   scmsc
   sctime
@@ -140,7 +150,6 @@
 ADD_EXECUTABLE(incon_test
   incon_test.cpp
 )
-
 TARGET_LINK_LIBRARIES(incon_test
   scmsc
   sctime
@@ -150,18 +159,15 @@
 ADD_EXECUTABLE(tighten_msc_test
   tighten_msc_test.cpp
 )
-
 TARGET_LINK_LIBRARIES(tighten_msc_test
   scmsc
   sctime
-
   scpseudocode
 )
 
 ADD_EXECUTABLE(bmsc_tightening_test
   bmsc_tightening_test.cpp
 )
-
 TARGET_LINK_LIBRARIES(bmsc_tightening_test
   scmsc
   sctime


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