rdme, mac cmake

gogo2 · Nov 11, 2019 · d62945d · d62945d
1 parent 593674b
commit d62945d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,15 +13,16 @@ elseif (APPLE)
     set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -undefined dynamic_lookup")
     set(PD_INSTALL_DIR_DEFAULT "/Applications/Pd-0.50-2.app")
     set(GEM_EXTERN_DIR_DEFAULT "/Users/$ENV{USER}/Documents/Pd/externals/Gem")
+    set(NDI_INSTALL_DIR_DEFAULT "/Library/NDI SDK for Apple" CACHE PATH "Directory containing NDI SDK")
 elseif (UNIX)
     set(PD_INSTALL_DIR_DEFAULT "/usr/include/pd")
     set(GEM_EXTERN_DIR_DEFAULT "/usr/include/Gem")
     set(NDI_INSTALL_DIR_DEFAULT "/home/$ENV{USER}/NDI SDK for Linux" CACHE PATH "Directory containing NDI SDK")
-    set(NDI_INSTALL_DIR ${NDI_INSTALL_DIR_DEFAULT} CACHE PATH "Installation directory of NDI SDK")
 endif ()
 
 set(PD_INSTALL_DIR ${PD_INSTALL_DIR_DEFAULT} CACHE PATH "Installation directory of pd")
 set(GEM_EXTERN_DIR ${GEM_EXTERN_DIR_DEFAULT} CACHE PATH "Directory containing Gem")
+set(NDI_INSTALL_DIR ${NDI_INSTALL_DIR_DEFAULT} CACHE PATH "Installation directory of NDI SDK")
 
 if(POLICY CMP0072)
 	cmake_policy(SET CMP0072 NEW)

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ is a software standard for broadcasting high quality video and audio over networ
     cmake ../
     make
     ```
-* You can specify non-default pd Gem's and NDI SDK installation directories by providing `PD_INSTALL_DIR`,  `GEM_EXTERN_DIR` and - linux only -`NDI_INSTALL_DIR` options to CMake
+* You can specify non-default pd Gem's and NDI SDK installation directories by providing `PD_INSTALL_DIR`,  `GEM_EXTERN_DIR` and - on linux and mac -`NDI_INSTALL_DIR` options to CMake
 
 ```$xslt
 cmake ../ -DPD_INSTALL_DIR=path/to/pd -DGEM_EXTERN_DIR=path/to/gem

diff --git a/cmake/FindNDI.cmake b/cmake/FindNDI.cmake
@@ -24,8 +24,8 @@ if (WIN32)
     set(NDI_LIB_NAME Processing.NDI.Lib.${NDI_ARCH})
     set(NDI_BASE_DIR $ENV{NDI_SDK_DIR})
 elseif (APPLE)
-    set(NDI_LIB_NAME ndi.3)
-    set(NDI_BASE_DIR "/NewTek NDI SDK")
+    set(NDI_LIB_NAME ndi.4)
+    set(NDI_BASE_DIR ${NDI_INSTALL_DIR})
 elseif (UNIX)
     set(NDI_LIB_NAME ndi)
     set(NDI_BASE_DIR ${NDI_INSTALL_DIR})