OSX: satisfy macro to also apply alembic tests
authorJens Verwiebe <info@jensverwiebe.de>
Sat, 22 Apr 2017 17:03:59 +0000 (19:03 +0200)
committerJens Verwiebe <info@jensverwiebe.de>
Sat, 22 Apr 2017 17:03:59 +0000 (19:03 +0200)
build_files/cmake/platform/platform_apple.cmake
tests/python/CMakeLists.txt

index 04485e31d981ebc222ca5bb91f0e4ac9a09294a8..6105f2e04deda296e687ab51ecd8ddf6c9c57245 100644 (file)
 
 # 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)
index fa13d1acc7b367720203b1909676011790b6d774..dca85dbf770b70818b00c891da9649c072dc451c 100644 (file)
@@ -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")