Changeset 249

Timestamp:

01/26/09 20:28:49 (16 years ago)

Author:

smidl

Message:

libconfig refactorization

Files:

• bdm/CMakeLists.txt (modified) (1 diff)
• tests/CMakeLists.txt (modified) (1 diff)
• tests/UI/UIbuilder_test.cpp (modified) (1 diff)

bdm/CMakeLists.txt

@@ -1 +1 @@
 # Create a library called "bdm" which includes sources from all directories
 
-add_subdirectory(config)
+#add_subdirectory(config)
 
 SET(BdmMath math/libDC.cpp math/libDC.h math/chmat.cpp math/chmat.h)
 SET(BdmStat stat/libDS.cpp stat/libDS.h stat/libFN.cpp stat/libFN.h stat/libBM.cpp stat/libBM.h stat/libEF.cpp stat/libEF.h stat/loggers.cpp stat/loggers.h stat/emix.cpp stat/emix.h)
 SET(BdmEstim estim/libKF.cpp estim/libKF.h estim/libPF.cpp estim/libPF.h estim/arx.cpp estim/arx.h estim/mixef.cpp estim/mixef.h estim/merger.cpp)
-SET(BdmUI userinfo.cpp userinfo.h)
+#SET(BdmUI userinfo.cpp userinfo.h)
+SET(BdmUI uibuilder.cpp uibuilder.h libconfig/libconfigcpp.c++ libconfig/grammar.c libconfig/libconfig.c libconfig/scanner.c)
 
-IF(${XERCES_FOUND})
+#IF(${XERCES_FOUND})
 add_library (bdm itpp_ext.cpp itpp_ext.h osutils.cpp osutils.h ${BdmMath} ${BdmStat} ${BdmEstim} ${BdmUI})
-ELSE(${XERCES_FOUND})
-add_library (bdm itpp_ext.cpp itpp_ext.h osutils.cpp osutils.h ${BdmMath} ${BdmStat} ${BdmEstim})
-ENDIF(${XERCES_FOUND})
+#ELSE(${XERCES_FOUND})
+#add_library (bdm itpp_ext.cpp itpp_ext.h osutils.cpp osutils.h ${BdmMath} ${BdmStat} ${BdmEstim})
+#ENDIF(${XERCES_FOUND})

tests/CMakeLists.txt

@@ -51 +51 @@
   target_link_libraries (testUI ${XERCES_LIBRARIES})
 ENDIF(${XERCES_FOUND})
+
+add_subdirectory(UI)

tests/UI/UIbuilder_test.cpp

@@ -1 @@
-#include <libconfig.h++>
-#include <fstream>
-#include <iostream>
-#include <sstream>
-
-#include "uibuilder.h"
+#include <uibuilder.h>
 
 using namespace libconfig;