Changeset 341

Timestamp:

05/14/09 17:16:41 (16 years ago)

Author:

smidl

Message:

Compilation stuff

Files:

• CMakeLists.txt (modified) (1 diff)
• CMake_modules/FindITPP.cmake (modified) (1 diff)
• applications/doprava/k1.cpp (modified) (1 diff)
• library/mex/CMakeLists.txt (modified) (2 diffs)
• library/mex/bm_note.sh (modified) (1 diff)
• library/mex/buildmex.sh (modified) (1 diff)

CMakeLists.txt

@@ -75 +75 @@
                         target_link_libraries (${FN} ${FRAMEWORK_VECLIB})
                 ENDIF(APPLE)
-                target_link_libraries (${FN} itpp)      
+#               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)

CMake_modules/FindITPP.cmake

@@ -12 +12 @@
 FIND_PATH(ITPP_INCLUDE_DIR itpp/itbase.h
         ${ITPP_DIR}
-        /usr/pkgs64/include
-        /usr/include
+#       /usr/pkgs64/include
+#       /usr/include
+  NO_DEFAULT_PATH
   )
 
 FIND_LIBRARY(ITPP_LIBRARY
-  NAMES itpp itpp_debug
+  NAMES itpp #itpp_debug
   PATHS ${ITPP_DIR}/libs
   ${ITPP_DIR}/itpp/.libs/
   "${ITPP_DIR}\\win32\\lib"
-  /usr/pkgs64/lib
-  /usr/lib64
-  /usr/lib
-  #NO_DEFAULT_PATH
+ # /usr/pkgs64/lib
+ # /usr/lib64
+ # /usr/lib
+  NO_DEFAULT_PATH
 )
 

applications/doprava/k1.cpp

@@ -27 +27 @@
         UIFile F ( fname ); //protected by exceptions, should complain if not found*/
         
-        ItppFileDS DS("data.it","Data");                // Data Source
+        ITppFileDS DS("data.it","Data");                // Data Source
         int ndat = DS.ndat();                           // number of data
         memlog L(ndat);                                         // Logger

library/mex/CMakeLists.txt

@@ -5 +5 @@
 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 -L${BDM_BINARY_DIR}/bdm -I${MATLAB_INCLUDE_DIR} -L${MATLAB_MEX_LIBRARY} -L${ITPP_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"
 )
@@ -11 +11 @@
 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)
+
 ENDIF(MEX_COMPILER)

library/mex/bm_note.sh

@@ -1 +1 @@
 #!/bin/sh
-mex -l itpp -l bdm -l blas -l lapack -I/home/smidl/bin/matlab2008a/extern/include -I/home/smidl/work/git/mixpp/bdm  -L ../../bdm/ -L /usr/lib64 $1 
+mex -l itpp -l bdm -l blas -l lapack-Wfatal-errors  -I/home/smidl/bin/matlab2008a/extern/include -I/home/smidl/work/git/mixpp/bdm  -L ../../bdm/ -L /usr/lib64 $1 
 #mxestimator.cpp
 #mex -l bdm -I ../../bdm/ -I /home/smidl/soft/matlab/matlab/extern/include -L ../../bdm/ linefit2.cpp

library/mex/buildmex.sh

@@ -8 +8 @@
 
 #mex -g -l itpp -l bdm -I$MATLAB_PATH/extern/include -I$BDM_PATH  -L ../../bdm/ -L ../../linux/libs/ $1 
-mex -l itpp -l bdm -I$MATLAB_PATH/extern/include -I$BDM_PATH  -L ../../bdm/ -L ../../linux/libs/ $1 
+mex -l itpp -l bdm -Wfatal-errors -I$MATLAB_PATH/extern/include -I$BDM_PATH  -L ../../bdm/ -L ../../linux/libs/ $1 
 #mxestimator.cpp
 #mex -l bdm -I ../../bdm/ -I /home/smidl/soft/matlab/matlab/extern/include -L ../../bdm/ linefit2.cpp