From 341d04307b0db294012da7d933d76a5bb7a83170 Mon Sep 17 00:00:00 2001
From: Jonathan Stone <jstone@lucasfilm.com>
Date: Fri, 14 Jul 2017 15:15:28 -0700
Subject: [PATCH] Additional fixes for OS X

---
 source/MaterialXCore/Value.cpp             | 4 ++--
 source/PyMaterialX/PyBind11/CMakeLists.txt | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/MaterialXCore/Value.cpp b/source/MaterialXCore/Value.cpp
index 31f74c004d..28b1992203 100644
--- a/source/MaterialXCore/Value.cpp
+++ b/source/MaterialXCore/Value.cpp
@@ -135,11 +135,11 @@ template <class T> class ValueRegistry
 //
 
 #define INSTANTIATE_TYPE(T, type)                                   \
+template <> const string TypedValue<T>::TYPE = type;                \
+template <> const T TypedValue<T>::ZERO = T();                      \
 template bool Value::isA<T>() const;                                \
 template T Value::asA<T>() const;                                   \
 template const string& getTypeString<T>();                          \
-template <> const string TypedValue<T>::TYPE = type;                \
-template <> const T TypedValue<T>::ZERO = T();                      \
 ValueRegistry<T> registry##T;
 
 INSTANTIATE_TYPE(int, "integer")
diff --git a/source/PyMaterialX/PyBind11/CMakeLists.txt b/source/PyMaterialX/PyBind11/CMakeLists.txt
index 4f852b6f34..218cca515f 100644
--- a/source/PyMaterialX/PyBind11/CMakeLists.txt
+++ b/source/PyMaterialX/PyBind11/CMakeLists.txt
@@ -61,6 +61,8 @@ function(pybind11_add_module target_name)
   set_target_properties(${target_name} PROPERTIES PREFIX "")
   if(WIN32)
     set_target_properties(${target_name} PROPERTIES SUFFIX ".pyd")
+  elseif(APPLE)
+    set_target_properties(${target_name} PROPERTIES SUFFIX ".so")
   endif()
 
   if(WIN32 OR CYGWIN)