Merge branch 'master' into cmake-bindings

CMake/ExternalAssimp.cmake

@@ -12,6 +12,10 @@ SET(assimp_CMAKE_ARGS
     -DBUILD_TESTS=OFF
 )
 
+IF(APPLE)
+LIST(APPEND assimp_CMAKE_ARGS -DCMAKE_CXX_FLAGS_RELEASE="-O2")
+ENDIF(APPLE)
+
 ExternalProject_Add(assimp
     PREFIX ${assimp_PREFIX}
 

Tools/Contents/polyimport/CMakeLists.txt

@@ -14,7 +14,7 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
 
 #IF(POLYCODE_BUILD_STATIC)
 ADD_EXECUTABLE(polyimport Source/polyimport.cpp Include/polyimport.h)
-TARGET_LINK_LIBRARIES(polyimport Polycore ${PHYSFS_LIBRARY}  ${ZLIB_LIBRARIES} ${ASSIMP_LIBRARIES}})
+TARGET_LINK_LIBRARIES(polyimport Polycore ${PHYSFS_LIBRARY}  ${ZLIB_LIBRARIES} ${ASSIMP_LIBRARIES})
 #ENDIF(POLYCODE_BUILD_STATIC)
 
 IF(POLYCODE_INSTALL_FRAMEWORK)