Updated cmake configuration for OSX

paperManu · paperManu · commit 53f3594f8fca · 2016-10-28T15:15:52.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -51,8 +51,15 @@ pkg_search_module(GSL REQUIRED gsl)
 pkg_search_module(ZMQ REQUIRED libzmq)
 
 # Optional dependencies
-set(Python_ADDITIONAL_VERSIONS 3.4 3.5)
-find_package(PythonLibs)
+if(UNIX AND NOT APPLE)
+    set(Python_ADDITIONAL_VERSIONS 3.4 3.5)
+    find_package(PythonLibs)
+elseif(APPLE)
+    pkg_check_modules(PYTHON python3)
+    set(PYTHONLIBS_VERSION_STRING ${PYTHON_VERSION})
+    set(PYTHONLIBS_FOUND ${PYTHON_FOUND})
+endif()
+
 find_package(Doxygen)
 pkg_search_module(GPHOTO libgphoto2)
 pkg_check_modules(FFMPEG libavformat libavcodec libavutil libswscale)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -57,7 +57,7 @@ link_directories(${FFMPEG_LIBRARY_DIRS})
 link_directories(${PORTAUDIO_LIBRARY_DIRS})
 link_directories(${OPENCV_LIBRARY_DIRS})
 link_directories(${SNAPPY_LIBRARY_DIRS})
-link_directories(${PYTHON_LIBRARIES})
+link_directories(${PYTHON_LIBRARY_DIRS})
 
 #
 # Targets
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -55,7 +55,7 @@ link_directories(${FFMPEG_LIBRARY_DIRS})
 link_directories(${PORTAUDIO_LIBRARY_DIRS})
 link_directories(${OPENCV_LIBRARY_DIRS})
 link_directories(${SNAPPY_LIBRARY_DIRS})
-link_directories(${PYTHON_LIBRARIES})
+link_directories(${PYTHON_LIBRARY_DIRS})
 
 add_executable(unitTests unitTests.cpp)
 target_sources(unitTests PRIVATE

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ link_directories(${FFMPEG_LIBRARY_DIRS})`
`57`	`57`	`link_directories(${PORTAUDIO_LIBRARY_DIRS})`
`58`	`58`	`link_directories(${OPENCV_LIBRARY_DIRS})`
`59`	`59`	`link_directories(${SNAPPY_LIBRARY_DIRS})`
`60`		`-link_directories(${PYTHON_LIBRARIES})`
	`60`	`+link_directories(${PYTHON_LIBRARY_DIRS})`
`61`	`61`
`62`	`62`	`#`
`63`	`63`	`# Targets`