Changeset 391

Timestamp:

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

Author:

smidl

Message:

compilation of bdmtoolbox - broken compilation of applications!

Files:

• applications/CMakeLists.txt (modified) (1 diff)
• applications/bdmtoolbox/CMakeLists.txt (modified) (1 diff)
• applications/bdmtoolbox/estimator.cpp (modified) (1 diff)
• applications/bdmtoolbox/mex/CMakeLists.txt (modified) (1 diff)
• applications/bdmtoolbox/mex/config2mxstruct.cpp (modified) (1 diff)
• applications/bdmtoolbox/mex/merger_mx.cpp (modified) (1 diff)
• applications/bdmtoolbox/mex/mxstruct2config.cpp (modified) (1 diff)
• library/bdm/mex/config2mxstruct.h (moved) (moved from applications/bdmtoolbox/mex/config2mxstruct.h) (1 diff)
• library/bdm/mex/mex_parser.h (modified) (1 diff)
• library/bdm/uibuilder.h (deleted)

applications/CMakeLists.txt

@@ -1 +1 @@
 # Compulsory line
 cmake_minimum_required(VERSION 2.6)
+
+SET(BDM_SOURCE_DIR "/home/smidl/work/git/mixpp/library")
+SET(CMAKE_MODULE_PATH "${BDM_SOURCE_DIR}/system/")
+SET(ITPP_DIR "${BDM_SOURCE_DIR}/system/linux/")
+
+#MESSAGE(${CMAKE_MODULE_PATH})
+
+# copy settings from library
+IF(WIN32)
+# IF YOU WANT TO USE YOUR OWN INSTALLATION OF THE NEXT EXTERNAL LIBRARIES,
+# THEN IT IS NECESSARY TO CREATE TEXT FILE "\system\WIN32\LOCAL_PATHS.TXT" WITH 
+# COPIES OF THE TWO FOLLOWING LINES AND THEN CORECT ALL THE INVOLVED PATHS
+        SET(ITPP_DIR "${BDM_SOURCE_DIR}\\system\\win32\\itpp-4.0.6")
+        SET(ACML_DIR "${BDM_SOURCE_DIR}\\system\\win32\\acml3.6.0")
+
+        INCLUDE(\\system\\win32\\local_paths.txt OPTIONAL)      
+        ADD_DEFINITIONS(-DHAVE_ACML)
+ENDIF(WIN32)
+IF(APPLE)
+        SET(ITPP_DIR "${BDM_SOURCE_DIR}\\macosx\\itpp-4.0.6")
+        FIND_LIBRARY(FRAMEWORK_VECLIB vecLib)
+        ADD_DEFINITIONS(-DHAVE_XLOCALE_H)
+ENDIF(APPLE)
+IF(UNIX)
+        #This is for UNIX makefile which does only one release at a time.
+        SET(CMAKE_BUILD_TYPE Debug)
+        SET(CMAKE_CXX_FLAGS "-Wall -pipe  -Wno-unknown-pragmas -fPIC")
+        SET(CMAKE_C_FLAGS "-Wall -pipe  -Wno-unknown-pragmas -fPIC")
+        SET(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG -O2")
+        SET(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+        #ADD_DEFINITIONS(-DNDEBUG)
+        
+        SET(MATLAB_ROOT ~/bin/matlab2008a)
+        # MATLAB_ROOT can be setup in Local
+ENDIF(UNIX)
+
+# Local ettings should be written to file called CMakeLists.local
+# Use this option for machine-specific options, such as prallel architectures
+INCLUDE(CMakeLists.local OPTIONAL)      
+
+FIND_PACKAGE(ITPP REQUIRED)
+FIND_PACKAGE(ACML COMPONENTS)
+FIND_PACKAGE(Matlab COMPONENTS)
+FIND_PROGRAM(MEX_COMPILER mex)
+
+IF(ITPP_FOUND)
+        INCLUDE_DIRECTORIES(${ITPP_INCLUDE_DIR})
+        LINK_DIRECTORIES(${NATIVE_ITPP_LIB_PATH})
+ENDIF(ITPP_FOUND)
+
+IF(ACML_FOUND)
+        INCLUDE_DIRECTORIES(${ACML_INCLUDE_DIR})
+        LINK_DIRECTORIES(${NATIVE_ACML_LIB_PATH})
+ENDIF(ACML_FOUND)
+
+##
+## PREPARE MACROS for building executables
+##
+
+MACRO(EXEC FN)
+        add_executable (${FN} ${FN}.cpp)
+        IF(WIN32)
+                target_link_libraries (${FN} debug itpp_debug)
+                target_link_libraries (${FN} optimized itpp)
+                target_link_libraries (${FN} libacml_dll)
+        ELSE(WIN32)
+                IF(APPLE)
+                        target_link_libraries (${FN} ${FRAMEWORK_VECLIB})
+                ENDIF(APPLE)
+#               target_link_libraries (${FN} itpp)      
+                target_link_libraries (${FN} debug itpp_debug)
+                target_link_libraries (${FN} optimized itpp)
+        ENDIF(WIN32)
+        target_link_libraries (${FN} bdm)
+        target_link_libraries (${FN} ${ARGN}) ## Additional libraries can be added to a macro
+ENDMACRO(EXEC)
+        
 
 add_subdirectory (pmsm)

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[] ) {

library/bdm/mex/config2mxstruct.h

@@ -1 @@
-#include "../../bdm/libconfig/libconfig.h++"
+#include "../base/libconfig/libconfig.h++"
 #include <itpp/itbase.h>
 #include <itpp/itmex.h>

library/bdm/mex/mex_parser.h

@@ -1 @@
-#include "../../bdm/libconfig/libconfig.h++"
+#include "../base/libconfig/libconfig.h++"
 #include <itpp/itbase.h>
 #include <itpp/itmex.h>