diff options
| author | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
| commit | 0829cebeb024095c268f190c34daa8ae9a5a224c (patch) | |
| tree | 12ee5a4a1c2a32e12eff47c8eb9bb0ed217791c1 /build_files/build_environment/CMakeLists.txt | |
| parent | cfde6ebf450594faa57c4bfeaecff10fe512c91b (diff) | |
| parent | 42be3964eb201180f6b0fa1ff6ce43b8c3845bc2 (diff) | |
Merge branch 'master' into asset-uuid--archivedasset-uuid--archived
Diffstat (limited to 'build_files/build_environment/CMakeLists.txt')
| -rw-r--r-- | build_files/build_environment/CMakeLists.txt | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt index dd90eb9adde..3c228fd9f7d 100644 --- a/build_files/build_environment/CMakeLists.txt +++ b/build_files/build_environment/CMakeLists.txt @@ -48,11 +48,7 @@ include(cmake/options.cmake) include(cmake/versions.cmake) if(ENABLE_MINGW64) - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - include(cmake/setup_mingw64.cmake) - else() - include(cmake/setup_mingw32.cmake) - endif() + include(cmake/setup_mingw64.cmake) else() set(mingw_LIBDIR ${LIBDIR}) endif() @@ -97,17 +93,18 @@ if(UNIX) else() include(cmake/pugixml.cmake) endif() +include(cmake/ispc.cmake) include(cmake/openimagedenoise.cmake) include(cmake/embree.cmake) -include(cmake/xr_openxr.cmake) +if(NOT APPLE) + include(cmake/xr_openxr.cmake) +endif() if(WITH_WEBP) include(cmake/webp.cmake) endif() if(WIN32) - # HMD branch deps - include(cmake/hidapi.cmake) # OCIO deps include(cmake/tinyxml.cmake) include(cmake/yamlcpp.cmake) |