Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/blender/datatoc/CMakeLists.txt5
-rw-r--r--source/creator/CMakeLists.txt5
2 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/datatoc/CMakeLists.txt b/source/blender/datatoc/CMakeLists.txt
index 3dc4a1add76..fa400ccf36d 100644
--- a/source/blender/datatoc/CMakeLists.txt
+++ b/source/blender/datatoc/CMakeLists.txt
@@ -52,7 +52,10 @@ if(NOT WITH_HEADLESS)
endif()
include_directories(${PNG_INCLUDE_DIRS})
- link_directories(${PNG_LIBPATH} ${ZLIB_LIBPATH})
+ if(NOT APPLE)
+ # APPLE plaform uses full paths for linking libraries.
+ link_directories(${PNG_LIBPATH} ${ZLIB_LIBPATH})
+ endif(NOT APPLE)
add_executable(datatoc_icon ${SRC})
setup_platform_linker_flags(datatoc_icon)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index b85586691f8..74c2797856d 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -73,7 +73,10 @@ endif()
if(WITH_TBB)
blender_include_dirs(${TBB_INCLUDE_DIRS})
- link_directories(${LIBDIR}/tbb/lib)
+ if(NOT APPLE)
+ # APPLE plaform uses full paths for linking libraries.
+ link_directories(${LIBDIR}/tbb/lib)
+ endif()
endif()