Changeset 320

Timestamp:

04/23/09 15:00:26 (16 years ago)

Author:

smidl

Message:

CMake compilation of mexes

Files:

• CMakeLists.txt (modified) (2 diffs)
• CMake_modules/FindMatlab.cmake (added)
• bdm/CMakeLists.txt (modified) (1 diff)
• library/CMakeLists.txt (added)
• library/mex/CMakeLists.txt (added)

CMakeLists.txt

@@ -38 +38 @@
         SET(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
         #ADD_DEFINITIONS(-DNDEBUG)
-        INCLUDE(CMakeLocal.txt OPTIONAL)        
+        
+        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(XERCES COMPONENTS)
+FIND_PACKAGE(Matlab COMPONENTS)
+FIND_PROGRAM(MEX_COMPILER mex)
 
 IF(ITPP_FOUND)
@@ -74 +81 @@
         target_link_libraries (${FN} ${ARGN}) ## Additional libraries can be added to a macro
 ENDMACRO(EXEC)
+        
 
-
-# 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)      
 
 # Recurse into the "dbm" and "tests" subdirectories.  This does not actually

bdm/CMakeLists.txt

@@ -7 +7 @@
 SET(BdmUI libconfig/libconfigcpp.cc libconfig/grammar.c libconfig/libconfig.c libconfig/scanner.c uibuilder.cpp uibuilder.h )
 
-#IF(${XERCES_FOUND})
+# Normal BDM library
 add_library (bdm STATIC itpp_ext.cpp itpp_ext.h osutils.cpp osutils.h ${BdmMath} ${BdmStat} ${BdmEstim} ${BdmUI})
-#set_target_properties(bdm PROPERTIES DEFINE_SYMBOL LIBCONFIG_STATIC)
-#ELSE(${XERCES_FOUND})
-#add_library (bdm itpp_ext.cpp itpp_ext.h osutils.cpp osutils.h ${BdmMath} ${BdmStat} ${BdmEstim})
-#ENDIF(${XERCES_FOUND})