diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-25 18:04:17 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-25 18:04:17 +0300 |
| commit | 6822e353ffa90e1fe8290b243b1bc2c43d5d157a (patch) | |
| tree | c843437f17399f8c4b1652c5433286c6537e1665 /build_files | |
| parent | 99d2d6f3871f88c485684c6f9c8b5f0ab0d8dda3 (diff) | |
| parent | 9dadd5ff937f81cc1e5aa9136b8eafb5a5414bb1 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/config/blender_full.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_release.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index bd8a2dbaf2c..87b8ed5f921 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -77,6 +77,6 @@ elseif(APPLE) set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE) - include("${CMAKE_SOURCE_DIR}/build_files/cmake/platform/platform_apple_xcode.cmake") + include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake") apple_check_quicktime() endif() diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index 42e8c111714..b60c8c7380c 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -78,6 +78,6 @@ elseif(APPLE) set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE) - include("${CMAKE_SOURCE_DIR}/build_files/cmake/platform/platform_apple_xcode.cmake") + include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake") apple_check_quicktime() endif() |