Show
Ignore:
Timestamp:
06/19/09 15:35:51 (15 years ago)
Author:
smidl
Message:

compilation of bdmtoolbox - broken compilation of applications!

Location:
applications/bdmtoolbox
Files:
6 modified

Legend:

Unmodified
Added
Removed
  • applications/bdmtoolbox/CMakeLists.txt

    r384 r391  
    22link_directories (${BDM_BINARY_DIR}/bdm) 
    33 
    4 EXEC(estimator) 
     4#EXEC(estimator) 
    55 
    66IF(MATLAB_FOUND) 
  • applications/bdmtoolbox/estimator.cpp

    r384 r391  
    4848 */ 
    4949 
    50 #include "stat/datasources.h" 
    51 #include "estim/arx.h" 
    52 #include "user_info.h" 
    53 #include "stat/loggers.h" 
     50#include <stat/datasources.h> 
     51#include <estim/arx.h> 
     52#include <user_info.h> 
     53#include <stat/loggers.h> 
    5454 
    5555using namespace bdm; 
  • applications/bdmtoolbox/mex/CMakeLists.txt

    r367 r391  
    11IF(MEX_COMPILER) 
    22 
    3 ADD_CUSTOM_COMMAND( 
    4 OUTPUT    estimator_mex 
    5 COMMAND   ${MEX_COMPILER} 
    6 #ARGS      -lblas -llapack -lbdm -I"${BDM_BINARY_DIR}/bdm" -L"${BDM_BINARY_DIR}/bdm" -I${MATLAB_INCLUDE_DIR} -L${ MATLAB_MEX_LIBRARY} estimator.cpp 
    7 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 
    8 COMMENT   "MEX" 
    9 ) 
     3MACRO(MEX FN) 
     4        INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIR} "${BDM_SOURCE_DIR}/bdm") 
     5        LINK_DIRECTORIES("${BDM_SOURCE_DIR}/bdm") 
     6        ADD_LIBRARY(${FN} MODULE ${FN}.cpp) 
     7        set_target_properties(${FN} PROPERTIES 
     8                PREFIX "" 
     9                SUFFIX  ".mexa64" 
     10        ) 
     11        TARGET_LINK_LIBRARIES(${FN} ${MATLAB_LIBRARIES} bdm itpp) 
     12ENDMACRO(MEX) 
    1013 
    11 #ADD_CUSTOM_TARGET(mex_test ALL DEPENDS estimator_mex) 
    12  
    13 ADD_CUSTOM_COMMAND( 
    14 OUTPUT    mx2cfg_mex 
    15 COMMAND   ${MEX_COMPILER} 
    16 #ARGS      -lblas -llapack -lbdm -I"${BDM_BINARY_DIR}/bdm" -L"${BDM_BINARY_DIR}/bdm" -I${MATLAB_INCLUDE_DIR} -L${ MATLAB_MEX_LIBRARY} estimator.cpp 
    17 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 
    18 COMMENT   "MEX" 
    19 ) 
    20  
    21 ADD_CUSTOM_TARGET(mex_cfg ALL DEPENDS mx2cfg_mex) 
     14MEX(merger_mx) 
     15MEX(config2mxstruct) 
     16MEX(mxstruct2config) 
    2217 
    2318ENDIF(MEX_COMPILER) 
  • applications/bdmtoolbox/mex/config2mxstruct.cpp

    r371 r391  
    1 #include "config2mxstruct.h" 
     1#include <mex/config2mxstruct.h> 
    22 
    33void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) { 
  • applications/bdmtoolbox/mex/merger_mx.cpp

    r388 r391  
    11#include <itpp/itmex.h> 
    2 #include <estim/merger.h> 
    3 #include "config2mxstruct.h" 
    4 #include "mexlog.h" 
    5 #include "mexparse.h" 
     2#include <stat/merger.h> 
     3#include <mex/mex_logger.h> 
     4#include <mex/mex_parser.h> 
     5#include <mex/config2mxstruct.h> 
    66 
    77using namespace bdm; 
  • applications/bdmtoolbox/mex/mxstruct2config.cpp

    r384 r391  
    1 #include "mex_parser.h" 
     1#include <mex/mex_parser.h> 
    22 
    33void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {