diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-23 11:49:39 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-23 11:49:39 +0300 |
| commit | f93f4169cbfb2e3d5583d1bca5aa8466f37393dc (patch) | |
| tree | aa9a9b92e3e01608dcb1c2ed82d464e03ba5577b /build_files | |
| parent | 79fd8eeb0e0dc10a9ca6825699d460c700d2aa3d (diff) | |
| parent | 20c9c1b44e13e3b5bccc9b1d7e7cb512b5a3f465 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
build_files/cmake/platform/platform_apple.cmake
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 5 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_win32_msvc.cmake | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index f2a6aee7a59..5336024b75c 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -25,6 +25,10 @@ set(MACOSX_DEPLOYMENT_TARGET "10.9") +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) @@ -54,6 +58,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/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) |