From dc5bd2784f320a5aa017565930291f08b0e1bbd4 Mon Sep 17 00:00:00 2001 From: lazydodo Date: Fri, 21 Apr 2017 12:18:19 -0600 Subject: [cmake] Fix Alembic build errors with msvc --- build_files/cmake/platform/platform_win32_msvc.cmake | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'build_files') diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake b/build_files/cmake/platform/platform_win32_msvc.cmake index 3ea93a96290..6447559f62c 100644 --- a/build_files/cmake/platform/platform_win32_msvc.cmake +++ b/build_files/cmake/platform/platform_win32_msvc.cmake @@ -37,6 +37,12 @@ macro(windows_find_package package_name endif(WITH_WINDOWS_FIND_MODULES) endmacro() +macro(find_package_wrapper) + if(WITH_WINDOWS_FIND_MODULES) + find_package(${ARGV}) + endif() +endmacro() + add_definitions(-DWIN32) # Minimum MSVC Version if(CMAKE_CXX_COMPILER_ID MATCHES MSVC) @@ -432,6 +438,7 @@ if(WITH_ALEMBIC) set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR}) set(ALEMBIC_LIBPATH ${ALEMBIC}/lib) set(ALEMBIC_LIBRARIES optimized alembic debug alembic_d) + set(ALEMBIC_FOUND 1) endif() if(WITH_MOD_CLOTH_ELTOPO) -- cgit v1.2.3 From 20c9c1b44e13e3b5bccc9b1d7e7cb512b5a3f465 Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Sat, 22 Apr 2017 19:03:59 +0200 Subject: OSX: satisfy macro to also apply alembic tests --- build_files/cmake/platform/platform_apple.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'build_files') 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) -- cgit v1.2.3