leoliuf · drwillis · Apr 23, 2018 · Apr 23, 2018 · Apr 23, 2018 · Apr 23, 2018
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+/Output/
+*.m~
diff --git a/Lib/bin/DoCESTScanAtGPU.mexa64 b/Lib/bin/DoCESTScanAtGPU.mexa64
diff --git a/Lib/bin/DoCalSARAtCPU.mexmaci64 b/Lib/bin/DoCalSARAtCPU.mexmaci64
diff --git a/Lib/bin/DoGMScanAtGPU.mexa64 b/Lib/bin/DoGMScanAtGPU.mexa64
diff --git a/Lib/bin/DoGridding.mexmaci64 b/Lib/bin/DoGridding.mexmaci64
diff --git a/Lib/bin/DoMEScanAtGPU.mexa64 b/Lib/bin/DoMEScanAtGPU.mexa64
diff --git a/Lib/bin/DoMTScanAtGPU.mexa64 b/Lib/bin/DoMTScanAtGPU.mexa64
diff --git a/Lib/bin/DoSARAverageAtCPU.mexmaci64 b/Lib/bin/DoSARAverageAtCPU.mexmaci64
diff --git a/Lib/bin/DoScanAtCPU.mexmaci64 b/Lib/bin/DoScanAtCPU.mexmaci64
diff --git a/Lib/bin/DoScanAtGPU.mexa64 b/Lib/bin/DoScanAtGPU.mexa64
diff --git a/Lib/src/.gitignore b/Lib/src/.gitignore
@@ -0,0 +1 @@
+/build/
diff --git a/Lib/src/CMakeLists.txt b/Lib/src/CMakeLists.txt
@@ -2,6 +2,33 @@
 cmake_minimum_required(VERSION 2.8)
 project(MRiLab)
 
+# Ubuntu Linux (local user install)
+SET(ENV{IPP_ROOT} /home.old/arwillis/intel)
+SET(ENV{MATLAB_ROOT} /usr/local/bin/matlab/R2018a)
+# On Mac OS X
+#SET(ENV{IPP_ROOT} /opt/intel)
+#SET(ENV{MATLAB_ROOT} /Applications/MATLAB_R2016b.app)
+
+SET(CMAKE_VERBOSE_MAKEFILE ON)
+#MESSAGE( STATUS "WIN32: " ${WIN32} )
+#MESSAGE( STATUS "UNIX: " ${UNIX} )
+#MESSAGE( STATUS "APPLE: " ${APPLE} )
+
+if (APPLE)
+SET(LLVM_DIR /usr/local/opt/llvm/share/cmake/modules/)
+SET(CMAKE_SKIP_BUILD_RPATH FALSE)
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+SET(MACOSX_RPATH 1)
+SET(CC /usr/local/opt/llvm/bin/clang)
+SET(CXX /usr/local/opt/llvm/bin/clang++)
+SET(CMAKE_CXX_COMPILER g++-7)
+endif(APPLE)
+
+
+#set(CC gcc)
+#set(CXX g++)
+
 set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR})
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 set(CMAKE_SIZEOF_VOID_P 8) # use 64-bit by default
@@ -13,7 +40,14 @@ add_definitions(/DMX_COMPAT_32)
 find_package(Matlab REQUIRED)
 find_package(IPP)
 find_package(Framewave)
-find_package(OpenMP)
+
+if (APPLE)
+  set(LDFLAGS -L/usr/local/opt/llvm/lib/)
+  find_package(LLVM)
+else(APPLE)
+  find_package(OpenMP)
+endif(APPLE)
+
 find_package(CUDA)
 find_package(VTK)
 find_package(Ismrmrd)

diff --git a/Lib/src/cmake/FindIPP.cmake b/Lib/src/cmake/FindIPP.cmake
@@ -20,6 +20,7 @@ ELSE( "$ENV{IPP_ROOT}" STREQUAL "" )
                 PATH_SUFFIXES ipp ipp/include)
             INCLUDE_DIRECTORIES(${IPP_INCLUDE_DIR})
 
+
             SET(IPP_LIB_PATH $ENV{IPP_ROOT}/lib/intel64/)
             FIND_LIBRARY( IPP_S_LIBRARY
                           NAMES "ipps_l"
@@ -49,7 +50,7 @@ ELSE( "$ENV{IPP_ROOT}" STREQUAL "" )
             INCLUDE_DIRECTORIES(${IPP_INCLUDE_DIR})
 
             SET(IPP_LIB_PATH $ENV{IPP_ROOT}/lib)
-
+    
             FIND_LIBRARY( IPP_SE_LIBRARY
                           NAMES ippsemergedem64t
                           PATHS ${IPP_LIB_PATH})
@@ -115,49 +116,50 @@ ELSE( "$ENV{IPP_ROOT}" STREQUAL "" )
             )
             MESSAGE (STATUS "IPP_ROOT (IPP 7): $ENV{IPP_ROOT}")
 
-        ELSE ($ENV{IPP_ROOT} MATCHES .*composer.*)    #IPP 6.X
+        ELSE ($ENV{IPP_ROOT} MATCHES .*composer.*)    #IPP 2018 UNIX/Mac OS X
 
             FIND_PATH(IPP_INCLUDE_DIR ipp.h
-                    PATHS $ENV{IPP_ROOT}/include $ENV{IPP_ROOT}/../include /usr/include /usr/local/include
+                    PATHS $ENV{IPP_ROOT}/ipp/include $ENV{IPP_ROOT}/../include /usr/include /usr/local/include
                     PATH_SUFFIXES ipp ipp/include)
             INCLUDE_DIRECTORIES(${IPP_INCLUDE_DIR})
 
-
-            SET(IPP_LIB_PATH $ENV{IPP_ROOT}/lib)
-
-            FIND_LIBRARY( IPP_SE_LIBRARY
-                          NAMES ippsemergedem64t
-                          PATHS ${IPP_LIB_PATH})
+            if (APPLE)
+              # Mac OS X relative path to IPP libraries
+              SET(IPP_LIB_PATH $ENV{IPP_ROOT}/ipp/lib)
+            else(APPLE)
+              # Linux/Unix relative path to 64-bit IPP libraries
+              SET(IPP_LIB_PATH $ENV{IPP_ROOT}/ipp/lib/intel64)
+            endif(APPLE)
 
             FIND_LIBRARY( IPP_S_LIBRARY
-                          NAMES ippsmergedem64t_t
-                          PATHS ${IPP_LIB_PATH})
-
-            FIND_LIBRARY( IPP_VME_LIBRARY
-                          NAMES ippvmemergedem64t
+                          NAMES "ipps"
                           PATHS ${IPP_LIB_PATH})
 
             FIND_LIBRARY( IPP_VM_LIBRARY
-                          NAMES ippvmmergedem64t_t
+                          NAMES "ippvm"
                           PATHS ${IPP_LIB_PATH})
 
-            FIND_LIBRARY( IPP_IOMP5_LIBRARY
-                          NAMES "iomp5"
-                          PATHS $ENV{IPP_ROOT}/sharedlib)
-
             FIND_LIBRARY( IPP_CORE_LIBRARY
-                          NAMES ippcoreem64t_t
+                          NAMES "ippcore"
                           PATHS ${IPP_LIB_PATH})
 
             SET(IPP_LIBRARIES
-              ${IPP_SE_LIBRARY}
               ${IPP_S_LIBRARY}
-              ${IPP_VME_LIBRARY}
               ${IPP_VM_LIBRARY}
-              ${IPP_IOMP5_LIBRARY}
               ${IPP_CORE_LIBRARY}
             )
 
+            # iomp5 library only exists for Mac OS X
+            if (APPLE)
+                FIND_LIBRARY( IPP_IOMP5_LIBRARY
+                  NAMES "iomp5"
+                  PATHS $ENV{IPP_ROOT}/lib)
+                SET(IPP_LIBRARIES
+                  ${IPP_LIBRARIES}
+                  ${IPP_IOMP5_LIBRARY}              
+                  )
+            endif(APPLE)
+
             MESSAGE (STATUS "IPP_ROOT (IPP 6): $ENV{IPP_ROOT}")
         ENDIF ($ENV{IPP_ROOT} MATCHES .*composer.*)
 
@@ -170,4 +172,4 @@ IF(IPP_INCLUDE_DIR AND IPP_LIBRARIES)
 ENDIF(IPP_INCLUDE_DIR AND IPP_LIBRARIES)
 
 INCLUDE( "FindPackageHandleStandardArgs" )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS("IPP" DEFAULT_MSG IPP_LIBRARIES IPP_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS("IPP" DEFAULT_MSG IPP_LIBRARIES IPP_INCLUDE_DIR)
diff --git a/Lib/src/cmake/FindMatlab.cmake b/Lib/src/cmake/FindMatlab.cmake
@@ -23,12 +23,14 @@ ELSE("$ENV{MATLAB_ROOT}" STREQUAL "" )
         FIND_LIBRARY( MATLAB_MEX_LIBRARY
                       NAMES libmex mex
                       PATHS $ENV{MATLAB_ROOT}/bin $ENV{MATLAB_ROOT}/extern/lib 
-                      PATH_SUFFIXES glnxa64 glnx86 win64/microsoft win32/microsoft)
+                      PATH_SUFFIXES glnxa64 glnx86 win64/microsoft win32/microsoft maci64 maci
+                      NO_DEFAULT_PATH)
 
         FIND_LIBRARY( MATLAB_MX_LIBRARY
                       NAMES libmx mx
-                      PATHS $ENV{MATLAB_ROOT}/bin $ENV{MATLAB_ROOT}/extern/lib 
-                      PATH_SUFFIXES glnxa64 glnx86 win64/microsoft win32/microsoft)
+                      PATHS $ENV{MATLAB_ROOT}/bin $ENV{MATLAB_ROOT}/extern/lib
+                      PATH_SUFFIXES glnxa64 glnx86 win64/microsoft win32/microsoft maci64 maci
+                      NO_DEFAULT_PATH)
 
     MESSAGE (STATUS "MATLAB_ROOT: $ENV{MATLAB_ROOT}")
 

diff --git a/Lib/src/engine/CMakeLists.txt b/Lib/src/engine/CMakeLists.txt
diff --git a/Lib/src/engine/CPUEngine/CMakeLists.txt b/Lib/src/engine/CPUEngine/CMakeLists.txt
@@ -2,7 +2,7 @@
 INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIR} ${IPP_INCLUDE_DIR} ${FW_INCLUDE_DIR})
 
 SET(CPP_FILES DoScanAtCPU DoCalSARAtCPU)
-
+SET(OpenMP_CXX_FLAGS -fopenmp)
 foreach(CPP_FILE ${CPP_FILES})
     SET(CPP_FILE_NAME ${CPP_FILE}.cpp)
     add_library(${CPP_FILE} SHARED ${CPP_FILE_NAME} ${CMAKE_SOURCE_DIR}/Matlabdef.def)
@@ -14,12 +14,18 @@ foreach(CPP_FILE ${CPP_FILES})
       else(CMAKE_CL_64)
           SET_TARGET_PROPERTIES(${CPP_FILE} PROPERTIES SUFFIX .mexw32 COMPILE_FLAGS ${OpenMP_CXX_FLAGS} LINK_FLAGS ${OpenMP_CXX_FLAGS})
       endif(CMAKE_CL_64)
-    else(WIN32)
+    elseif(UNIX AND NOT APPLE)
       if (CMAKE_SIZEOF_VOID_P MATCHES "8")
           SET_TARGET_PROPERTIES(${CPP_FILE} PROPERTIES SUFFIX .mexa64 PREFIX "" COMPILE_FLAGS ${OpenMP_CXX_FLAGS} LINK_FLAGS ${OpenMP_CXX_FLAGS})
       else(CMAKE_SIZEOF_VOID_P MATCHES "8")
           SET_TARGET_PROPERTIES(${CPP_FILE} PROPERTIES SUFFIX .mexglx PREFIX "" COMPILE_FLAGS ${OpenMP_CXX_FLAGS} LINK_FLAGS ${OpenMP_CXX_FLAGS})
       endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
+    elseif(APPLE)
+      if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+          SET_TARGET_PROPERTIES(${CPP_FILE} PROPERTIES SUFFIX .mexmaci64 PREFIX "" COMPILE_FLAGS ${OpenMP_CXX_FLAGS} LINK_FLAGS ${OpenMP_CXX_FLAGS})
+      else(CMAKE_SIZEOF_VOID_P MATCHES "8")
+          SET_TARGET_PROPERTIES(${CPP_FILE} PROPERTIES SUFFIX .mexmaci PREFIX "" COMPILE_FLAGS ${OpenMP_CXX_FLAGS} LINK_FLAGS ${OpenMP_CXX_FLAGS})
+      endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
     endif(WIN32)
 
     install(TARGETS ${CPP_FILE} DESTINATION ../bin)

diff --git a/Lib/src/engine/CPUEngine/DoCalSARAtCPU.cpp b/Lib/src/engine/CPUEngine/DoCalSARAtCPU.cpp
@@ -63,7 +63,8 @@ and multi-threading (OpenMP) written by Fang Liu ([email protected]).
 
 /* includes CPU kernel */
 #include "SARKernel.h"
-extern "C" bool mxUnshareArray(mxArray *array_ptr, bool noDeepCopy);
+//extern "C" bool mxUnshareArray(mxArray *array_ptr, bool noDeepCopy);
+extern "C" int mxUnshareArray(mxArray *array_ptr, int noDeepCopy);
 
 /* MEX entry function */
 void mexFunction(int nlhs, mxArray *plhs[],int nrhs, const mxArray *prhs[])

diff --git a/Lib/src/engine/CPUEngine/DoScanAtCPU.cpp b/Lib/src/engine/CPUEngine/DoScanAtCPU.cpp
@@ -64,7 +64,8 @@ and multi-threading (OpenMP) written by Fang Liu ([email protected]).
 
 /* includes CPU kernel */
 #include "BlochKernel.h"
-extern "C" bool mxUnshareArray(mxArray *array_ptr, bool noDeepCopy);
+//extern "C" bool mxUnshareArray(mxArray *array_ptr, bool noDeepCopy);
+extern "C" int mxUnshareArray(mxArray *array_ptr, int noDeepCopy);
 
 /* MEX entry function */
 void mexFunction(int nlhs, mxArray *plhs[],int nrhs, const mxArray *prhs[])

diff --git a/Lib/src/engine/GPUEngine/CMakeLists.txt b/Lib/src/engine/GPUEngine/CMakeLists.txt
@@ -1,18 +1,16 @@
 
 IF (IPP_FOUND) # use ipp
     # compile kernels for shader models 20 30 35 50, support double-precision floating-point operation
-    set(CUDA_NVCC_FLAGS -Xcompiler -fPIC -use_fast_math -gencode=arch=compute_20,code="sm_20,compute_20"  
-																								 -gencode=arch=compute_30,code="sm_30,compute_30" 
-																								 -gencode=arch=compute_35,code="sm_35,compute_35" 
-																								 -gencode=arch=compute_50,code="sm_50,compute_50" 
-																								--ptxas-options=-v -DMATLAB_MEX_FILE -DIPP)
+    set(CUDA_NVCC_FLAGS -Xcompiler -fPIC -gencode=arch=compute_30,code="sm_30,compute_30" 
+						-gencode=arch=compute_35,code="sm_35,compute_35" 
+						-gencode=arch=compute_50,code="sm_50,compute_50"
+						--ptxas-options=-v -DMATLAB_MEX_FILE -DIPP)
 else (IPP_FOUND) # use framewave
     # compile kernels for shader models 20 21 30 35 50, support double-precision floating-point operation
-    set(CUDA_NVCC_FLAGS -Xcompiler -fPIC -use_fast_math -gencode=arch=compute_20,code="sm_20,compute_20"
-																								 -gencode=arch=compute_30,code="sm_30,compute_30" 
-																								 -gencode=arch=compute_35,code="sm_35,compute_35" 
-																								 -gencode=arch=compute_50,code="sm_50,compute_50" 
-																								--ptxas-options=-v -DMATLAB_MEX_FILE -DFW)
+    set(CUDA_NVCC_FLAGS -Xcompiler -fPIC -gencode=arch=compute_30,code="sm_30,compute_30" 
+						 -gencode=arch=compute_35,code="sm_35,compute_35" 
+						 -gencode=arch=compute_50,code="sm_50,compute_50" 
+						--ptxas-options=-v -DMATLAB_MEX_FILE -DFW)
 endif (IPP_FOUND)
 
 set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler ${OpenMP_CXX_FLAGS})
@@ -38,11 +36,17 @@ foreach(CU_FILE ${CU_FILES})
         else(CMAKE_CL_64)
           SET_TARGET_PROPERTIES(${CU_FILE} PROPERTIES SUFFIX .mexw32)
         endif(CMAKE_CL_64)
-    else(WIN32)
+    elseif(UNIX AND NOT APPLE)
         if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-          SET_TARGET_PROPERTIES(${CU_FILE} PROPERTIES SUFFIX .mexa64 PREFIX "")
+            SET_TARGET_PROPERTIES(${CU_FILE} PROPERTIES SUFFIX .mexa64 PREFIX "")
         else(CMAKE_SIZEOF_VOID_P MATCHES "8")
-          SET_TARGET_PROPERTIES(${CU_FILE} PROPERTIES SUFFIX .mexglx PREFIX "")
+            SET_TARGET_PROPERTIES(${CU_FILE} PROPERTIES SUFFIX .mexglx PREFIX "")
+        endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
+    elseif(APPLE)
+        if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+            SET_TARGET_PROPERTIES(${CU_FILE} PROPERTIES SUFFIX .mexmaci64 PREFIX "")
+        else(CMAKE_SIZEOF_VOID_P MATCHES "8")
+            SET_TARGET_PROPERTIES(${CU_FILE} PROPERTIES SUFFIX .mexmaci PREFIX "")
         endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
     endif(WIN32)
 

diff --git a/Lib/src/engine/GPUEngine/DoCESTScanAtGPU.cu b/Lib/src/engine/GPUEngine/DoCESTScanAtGPU.cu
@@ -70,7 +70,8 @@
 
 /* includes CUDA kernel */
 #include "BlochKernelCEST.cuh"
-extern "C" bool mxUnshareArray(mxArray *array_ptr, bool noDeepCopy);
+//extern "C" bool mxUnshareArray(mxArray *array_ptr, bool noDeepCopy);
+extern "C" int mxUnshareArray(mxArray *array_ptr, int noDeepCopy);
 
 /* MEX entry function */
 void mexFunction(int nlhs, mxArray *plhs[],int nrhs, const mxArray *prhs[])

diff --git a/Lib/src/engine/GPUEngine/DoGMScanAtGPU.cu b/Lib/src/engine/GPUEngine/DoGMScanAtGPU.cu
@@ -70,7 +70,8 @@
 
 /* includes CUDA kernel */
 #include "BlochKernelGM.cuh"
-extern "C" bool mxUnshareArray(mxArray *array_ptr, bool noDeepCopy);
+//extern "C" bool mxUnshareArray(mxArray *array_ptr, bool noDeepCopy);
+extern "C" int mxUnshareArray(mxArray *array_ptr, int noDeepCopy);
 
 /* MEX entry function */
 void mexFunction(int nlhs, mxArray *plhs[],int nrhs, const mxArray *prhs[])

diff --git a/Lib/src/engine/GPUEngine/DoMEScanAtGPU.cu b/Lib/src/engine/GPUEngine/DoMEScanAtGPU.cu
@@ -70,7 +70,8 @@
 
 /* includes CUDA kernel */
 #include "BlochKernelME.cuh"
-extern "C" bool mxUnshareArray(mxArray *array_ptr, bool noDeepCopy);
+//extern "C" bool mxUnshareArray(mxArray *array_ptr, bool noDeepCopy);
+extern "C" int mxUnshareArray(mxArray *array_ptr, int noDeepCopy);
 
 /* MEX entry function */
 void mexFunction(int nlhs, mxArray *plhs[],int nrhs, const mxArray *prhs[])

diff --git a/Lib/src/engine/GPUEngine/DoMTScanAtGPU.cu b/Lib/src/engine/GPUEngine/DoMTScanAtGPU.cu
@@ -70,7 +70,8 @@
 
 /* includes CUDA kernel */
 #include "BlochKernelMT.cuh"
-extern "C" bool mxUnshareArray(mxArray *array_ptr, bool noDeepCopy);
+//extern "C" bool mxUnshareArray(mxArray *array_ptr, bool noDeepCopy);
+extern "C" int mxUnshareArray(mxArray *array_ptr, int noDeepCopy);
 
 /* MEX entry function */
 void mexFunction(int nlhs, mxArray *plhs[],int nrhs, const mxArray *prhs[])

diff --git a/Lib/src/engine/GPUEngine/DoScanAtGPU.cu b/Lib/src/engine/GPUEngine/DoScanAtGPU.cu
@@ -70,7 +70,8 @@
 
 /* includes CUDA kernel */
 #include "BlochKernel.cuh"
-extern "C" bool mxUnshareArray(mxArray *array_ptr, bool noDeepCopy);
+//extern "C" bool mxUnshareArray(mxArray *array_ptr, bool noDeepCopy);
+extern "C" int mxUnshareArray(mxArray *array_ptr, int noDeepCopy);
 
 /* MEX entry function */
 void mexFunction(int nlhs, mxArray *plhs[],int nrhs, const mxArray *prhs[])

diff --git a/Lib/src/interface/DoMatToHDF5/CMakeLists.txt b/Lib/src/interface/DoMatToHDF5/CMakeLists.txt
@@ -11,12 +11,18 @@ if(WIN32)
   else(CMAKE_CL_64)
       SET_TARGET_PROPERTIES(DoMatToHDF5 PROPERTIES SUFFIX .mexw32)
   endif(CMAKE_CL_64)
-else(WIN32)
+elseif(UNIX AND NOT APPLE)
   if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-      SET_TARGET_PROPERTIES(DoMatToHDF5 PROPERTIES SUFFIX .mexa64 PREFIX "") 
+      SET_TARGET_PROPERTIES(DoMatToHDF5 PROPERTIES SUFFIX .mexa64 PREFIX "")
   else(CMAKE_SIZEOF_VOID_P MATCHES "8")
       SET_TARGET_PROPERTIES(DoMatToHDF5 PROPERTIES SUFFIX .mexglx PREFIX "")
   endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
+else(APPLE)
+  if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+      SET_TARGET_PROPERTIES(DoMatToHDF5 PROPERTIES SUFFIX .mexmaci64 PREFIX "")
+  else(CMAKE_SIZEOF_VOID_P MATCHES "8")
+      SET_TARGET_PROPERTIES(DoMatToHDF5 PROPERTIES SUFFIX .mexmaci PREFIX "")
+  endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
 endif(WIN32)
 
 install(TARGETS DoMatToHDF5 DESTINATION ../bin)
diff --git a/Lib/src/recon/DoGridding/CMakeLists.txt b/Lib/src/recon/DoGridding/CMakeLists.txt
@@ -10,12 +10,18 @@ if(WIN32)
   else(CMAKE_CL_64)
       SET_TARGET_PROPERTIES(DoGridding PROPERTIES SUFFIX .mexw32)
   endif(CMAKE_CL_64)
-else(WIN32)
-  if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-      SET_TARGET_PROPERTIES(DoGridding PROPERTIES SUFFIX .mexa64 PREFIX "")
-  else(CMAKE_SIZEOF_VOID_P MATCHES "8")
-      SET_TARGET_PROPERTIES(DoGridding PROPERTIES SUFFIX .mexglx PREFIX "")
-  endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
+elseif(UNIX AND NOT APPLE)
+    if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+        SET_TARGET_PROPERTIES(DoGridding PROPERTIES SUFFIX .mexa64 PREFIX "")
+    else(CMAKE_SIZEOF_VOID_P MATCHES "8")
+        SET_TARGET_PROPERTIES(DoGridding PROPERTIES SUFFIX .mexglx PREFIX "")
+    endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
+elseif(APPLE)
+    if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+        SET_TARGET_PROPERTIES(DoGridding PROPERTIES SUFFIX .mexmaci64 PREFIX "")
+    else(CMAKE_SIZEOF_VOID_P MATCHES "8")
+        SET_TARGET_PROPERTIES(DoGridding PROPERTIES SUFFIX .mexmaci PREFIX "")
+    endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
 endif(WIN32)
 
 install(TARGETS DoGridding DESTINATION ../bin)
diff --git a/Lib/src/renderer/CMakeLists.txt b/Lib/src/renderer/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-include(${VTK_USE_FILE})
+#include(${VTK_USE_FILE})
 
 if (VTK_FOUND)
     add_subdirectory(DoKSpaceTrajVTK)

diff --git a/Lib/src/renderer/DoKSpaceTrajVTK/CMakeLists.txt b/Lib/src/renderer/DoKSpaceTrajVTK/CMakeLists.txt
@@ -1,18 +1,25 @@
 
 add_library(DoKSpaceTrajVTK SHARED DoKSpaceTrajVTK.cpp ${CMAKE_SOURCE_DIR}/Matlabdef.def)
 target_link_libraries(DoKSpaceTrajVTK ${MATLAB_LIBRARIES})
+include_directories(SYSTEM ${VTK_INCLUDE_DIRS})
 
 if(WIN32)
     if (CMAKE_CL_64)
       SET_TARGET_PROPERTIES(DoKSpaceTrajVTK PROPERTIES SUFFIX .mexw64)
     else(CMAKE_CL_64)
       SET_TARGET_PROPERTIES(DoKSpaceTrajVTK PROPERTIES SUFFIX .mexw32)
     endif(CMAKE_CL_64)
-else(WIN32)
+elseif(UNIX AND NOT APPLE)
     if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-      SET_TARGET_PROPERTIES(DoKSpaceTrajVTK PROPERTIES SUFFIX .mexa64 PREFIX "")
+       SET_TARGET_PROPERTIES(DoKSpaceTrajVTK PROPERTIES SUFFIX .mexa64 PREFIX "")
     else(CMAKE_SIZEOF_VOID_P MATCHES "8")
-      SET_TARGET_PROPERTIES(DoKSpaceTrajVTK PROPERTIES SUFFIX .mexglx PREFIX "")
+        SET_TARGET_PROPERTIES(DoKSpaceTrajVTK PROPERTIES SUFFIX .mexglx PREFIX "")
+    endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
+elseif(APPLE)
+    if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+        SET_TARGET_PROPERTIES(DoKSpaceTrajVTK PROPERTIES SUFFIX .mexmaci64 PREFIX "")
+    else(CMAKE_SIZEOF_VOID_P MATCHES "8")
+        SET_TARGET_PROPERTIES(DoKSpaceTrajVTK PROPERTIES SUFFIX .mexmaci PREFIX "")
     endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
 endif(WIN32)