Commit: 20c9c1b44e13e3b5bccc9b1d7e7cb512b5a3f465
Author: Jens Verwiebe
Date: Sat Apr 22 19:03:59 2017 +0200
Branches: master
https://developer.blender.org/rB20c9c1b44e13e3b5bccc9b1d7e7cb512b5a3f465
OSX: satisfy macro to also apply alembic tests
===================================================================
M build_files/cmake/platform/platform_apple.cmake
M tests/python/CMakeLists.txt
===================================================================
diff --git a/build_files/cmake/platform/platform_apple.cmake
b/build_files/cmake/platform/platform_apple.cmake
index 04485e31d98..6105f2e04de 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -23,6 +23,10 @@
# Libraries configuration for Apple.
+macro(find_package_wrapper)
+# do nothing, just satisfy the macro
+endmacro()
+
if(NOT DEFINED LIBDIR)
if(WITH_CXX11)
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin)
@@ -52,6 +56,7 @@ if(WITH_ALEMBIC)
set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
set(ALEMBIC_LIBPATH ${ALEMBIC}/lib)
set(ALEMBIC_LIBRARIES Alembic)
+ set(ALEMBIC_FOUND ON)
endif()
if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index fa13d1acc7b..dca85dbf770 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -443,7 +443,7 @@ if(WITH_CYCLES)
endif()
endif()
-if(WITH_ALEMBIC AND NOT APPLE)
+if(WITH_ALEMBIC)
find_package_wrapper(Alembic)
if(NOT ALEMBIC_FOUND)
message(FATAL_ERROR "Alembic is enabled but cannot be found")
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
