[Bf-blender-cvs] [dc5bd2784f3] master: [cmake] Fix Alembic build errors with msvc

lazydodo noreply at git.blender.org
Fri Apr 21 20:18:35 CEST 2017


Commit: dc5bd2784f320a5aa017565930291f08b0e1bbd4
Author: lazydodo
Date:   Fri Apr 21 12:18:19 2017 -0600
Branches: master
https://developer.blender.org/rBdc5bd2784f320a5aa017565930291f08b0e1bbd4

[cmake] Fix Alembic build errors with msvc

===================================================================

M	build_files/cmake/platform/platform_win32_msvc.cmake

===================================================================

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)




More information about the Bf-blender-cvs mailing list