Merge pull request #5 from jstone-lucasfilm/master

Additional fixes for OS X build
AcademySoftwareFoundation · Jul 14, 2017 · d774e6e · d774e6e · jstone-lucasfilm · Jul 14, 2017
2 parents 345aeea + 341d043
commit d774e6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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)