Changeset 415

Timestamp:

07/14/09 18:23:57 (15 years ago)

Author:

smidl

Message:

compilation fixes by Karel Vrbensky

Location:

library

Files:

• bdm/osutils.cpp (modified) (1 diff)
• system/SetBdmEnv.cmake (modified) (3 diffs)

library/bdm/osutils.cpp

@@ -35 +35 @@
 void makedir ( string &dirname, bool rewrite ) {
 #ifdef WIN32
-        if ( mkdir ( dirname.c_str() ) == -1 )   // Create the directory
+        if ( _mkdir ( dirname.c_str() ) == -1 )   // Create the directory
 #else
         if ( mkdir ( dirname.c_str(), 00755 ) == -1 )   // Create the directory

library/system/SetBdmEnv.cmake

@@ -25 +25 @@
         INCLUDE(\\system\\win32\\local_paths.txt OPTIONAL)      
         ADD_DEFINITIONS(-DHAVE_ACML)
+        ADD_DEFINITIONS(/wd4290)
+        ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
 ENDIF(WIN32)
 IF(APPLE)
@@ -101 +103 @@
         INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIR} "${BDM_SOURCE_DIR}/bdm")
         LINK_DIRECTORIES("${BDM_SOURCE_DIR}/bdm")
+        IF(WIN32)
+                ADD_DEFINITIONS(/EXPORT:_mexFunction)
+        ENDIF(WIN32)
         ADD_LIBRARY("${FN}.${MATLAB_MEX_SUFFIX}" MODULE ${FN}.cpp)
         set_target_properties("${FN}.${MATLAB_MEX_SUFFIX}" PROPERTIES
@@ -107 +112 @@
                 COMPILE_FLAGS "-DMEX"
         )
+        # general libraries
         TARGET_LINK_LIBRARIES("${FN}.${MATLAB_MEX_SUFFIX}" ${MATLAB_LIBRARIES} bdm itpp)
+        # platform specific libraries
+        IF(WIN32)
+                target_link_libraries ("${FN}.${MATLAB_MEX_SUFFIX}" libacml_dll)
+        ELSE(WIN32)
+                IF(APPLE)
+                        target_link_libraries ("${FN}.${MATLAB_MEX_SUFFIX}" ${FRAMEWORK_VECLIB})
+                ENDIF(APPLE)
+        ENDIF(WIN32)
+        ## Additional libraries can be added to a macro
+        target_link_libraries ("${FN}.${MATLAB_MEX_SUFFIX}" ${ARGN}) 
         ENDIF(MEX_COMPILER)
 ENDMACRO(MEX)