Changeset 391 for applications/bdmtoolbox

Timestamp:

06/19/09 15:35:51 (16 years ago)

Author:

smidl

Message:

compilation of bdmtoolbox - broken compilation of applications!

Location:

applications/bdmtoolbox

Files:

• CMakeLists.txt (modified) (1 diff)
• estimator.cpp (modified) (1 diff)
• mex/CMakeLists.txt (modified) (1 diff)
• mex/config2mxstruct.cpp (modified) (1 diff)
• mex/merger_mx.cpp (modified) (1 diff)
• mex/mxstruct2config.cpp (modified) (1 diff)

applications/bdmtoolbox/CMakeLists.txt

@@ -2 +2 @@
 link_directories (${BDM_BINARY_DIR}/bdm)
 
-EXEC(estimator)
+#EXEC(estimator)
 
 IF(MATLAB_FOUND)

applications/bdmtoolbox/estimator.cpp

@@ -48 +48 @@
  */
 
-#include "stat/datasources.h"
-#include "estim/arx.h"
-#include "user_info.h"
-#include "stat/loggers.h"
+#include <stat/datasources.h>
+#include <estim/arx.h>
+#include <user_info.h>
+#include <stat/loggers.h>
 
 using namespace bdm;

applications/bdmtoolbox/mex/CMakeLists.txt

@@ -1 +1 @@
 IF(MEX_COMPILER)
 
-ADD_CUSTOM_COMMAND(
-OUTPUT    estimator_mex
-COMMAND   ${MEX_COMPILER}
-#ARGS      -lblas -llapack -lbdm -I"${BDM_BINARY_DIR}/bdm" -L"${BDM_BINARY_DIR}/bdm" -I${MATLAB_INCLUDE_DIR} -L${ MATLAB_MEX_LIBRARY} estimator.cpp
-ARGS      -v -lblas -llapack -lbdm -litpp -I${BDM_BINARY_DIR}/bdm -I${ITPP_INCLUDE_DIR} -L${BDM_BINARY_DIR}/bdm -I${MATLAB_INCLUDE_DIR} -L${MATLAB_MEX_LIBRARY} -L${NATIVE_ITPP_LIB_PATH} estimator.cpp
-COMMENT   "MEX"
-)
+MACRO(MEX FN)
+        INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIR} "${BDM_SOURCE_DIR}/bdm")
+        LINK_DIRECTORIES("${BDM_SOURCE_DIR}/bdm")
+        ADD_LIBRARY(${FN} MODULE ${FN}.cpp)
+        set_target_properties(${FN} PROPERTIES
+                PREFIX ""
+                SUFFIX  ".mexa64"
+        )
+        TARGET_LINK_LIBRARIES(${FN} ${MATLAB_LIBRARIES} bdm itpp)
+ENDMACRO(MEX)
 
-#ADD_CUSTOM_TARGET(mex_test ALL DEPENDS estimator_mex)
-
-ADD_CUSTOM_COMMAND(
-OUTPUT    mx2cfg_mex
-COMMAND   ${MEX_COMPILER}
-#ARGS      -lblas -llapack -lbdm -I"${BDM_BINARY_DIR}/bdm" -L"${BDM_BINARY_DIR}/bdm" -I${MATLAB_INCLUDE_DIR} -L${ MATLAB_MEX_LIBRARY} estimator.cpp
-ARGS      -v -lblas -llapack -lbdm -litpp -I${BDM_BINARY_DIR}/bdm -I${ITPP_INCLUDE_DIR} -L${BDM_BINARY_DIR}/bdm -I${MATLAB_INCLUDE_DIR} -L${MATLAB_MEX_LIBRARY} -L${NATIVE_ITPP_LIB_PATH} mxstruct2config.cpp
-COMMENT   "MEX"
-)
-
-ADD_CUSTOM_TARGET(mex_cfg ALL DEPENDS mx2cfg_mex)
+MEX(merger_mx)
+MEX(config2mxstruct)
+MEX(mxstruct2config)
 
 ENDIF(MEX_COMPILER)

applications/bdmtoolbox/mex/config2mxstruct.cpp

@@ -1 @@
-#include "config2mxstruct.h"
+#include <mex/config2mxstruct.h>
 
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {

applications/bdmtoolbox/mex/merger_mx.cpp

@@ -1 +1 @@
 #include <itpp/itmex.h>
-#include <estim/merger.h>
-#include "config2mxstruct.h"
-#include "mexlog.h"
-#include "mexparse.h"
+#include <stat/merger.h>
+#include <mex/mex_logger.h>
+#include <mex/mex_parser.h>
+#include <mex/config2mxstruct.h>
 
 using namespace bdm;

applications/bdmtoolbox/mex/mxstruct2config.cpp

@@ -1 @@
-#include "mex_parser.h"
+#include <mex/mex_parser.h>
 
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {