Changeset 662 for library/system/SetBdmEnv.cmake

Timestamp:

10/15/09 12:07:25 (15 years ago)

Author:

suzdalev

Message:

mac compilation

Files:

• library/system/SetBdmEnv.cmake (modified) (4 diffs)

library/system/SetBdmEnv.cmake

@@ -30 +30 @@
 IF(APPLE)
         IF(NOT ITPP_DIR)
-                SET(ITPP_DIR "${BDM_SOURCE_DIR}/macosx/itpp-4.0.6")
+                SET(ITPP_DIR "${BDM_SOURCE_DIR}/system/macosx/itpp-4.0.6")
         ENDIF(NOT ITPP_DIR)
         FIND_LIBRARY(FRAMEWORK_VECLIB vecLib)
@@ -51 +51 @@
 FIND_PACKAGE(ACML COMPONENTS)
 FIND_PACKAGE(Matlab COMPONENTS)
-FIND_PROGRAM(MEX_COMPILER mex)
 
 IF(ITPP_FOUND)
@@ -122 +121 @@
         
 MACRO(MEX FN)
-        IF(MEX_COMPILER)
+        IF(MATLAB_FOUND)
         INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIR} "${BDM_SOURCE_DIR}/bdm")
         LINK_DIRECTORIES("${BDM_SOURCE_DIR}/bdm")
+        IF(APPLE)
+            LINK_DIRECTORIES("/Applications/MATLAB_R2007b/bin/maci/")
+        ENDIF(APPLE)
         IF(WIN32)
                 ADD_LIBRARY("${FN}.${MATLAB_MEX_SUFFIX}" MODULE ${FN}.cpp "${BDM_SOURCE_DIR}/system/mexFunction.def")
@@ -148 +150 @@
         ## Additional libraries can be added to a macro
         target_link_libraries ("${FN}.${MATLAB_MEX_SUFFIX}" ${ARGN}) 
-        ENDIF(MEX_COMPILER)
+        ENDIF(MATLAB_FOUND)
 ENDMACRO(MEX)