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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-03-13 14:33:31 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-03-13 14:36:01 +0300
commitbb825d02f8570c408f4266dfa4eff53d2d0bf4f6 (patch)
tree3c452fcb5497c8c72a1fd8ebf7f109e5a89055a6 /source/blender/blenkernel/CMakeLists.txt
parent61eab743f1377fdfcf44f2e4928290a3fc4ccfea (diff)
CMake: unbundle LZO library
Patch T41989 by @hasufell
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
-rw-r--r--source/blender/blenkernel/CMakeLists.txt13
1 files changed, 10 insertions, 3 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index b3469ceae57..a826fe26e68 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -422,9 +422,16 @@ if(WITH_JACK)
endif()
if(WITH_LZO)
- list(APPEND INC_SYS
- ../../../extern/lzo/minilzo
- )
+ if(WITH_SYSTEM_LZO)
+ list(APPEND INC_SYS
+ ${LZO_INCLUDE_DIR}
+ )
+ add_definitions(-DWITH_SYSTEM_LZO)
+ else()
+ list(APPEND INC_SYS
+ ../../../extern/lzo/minilzo
+ )
+ endif()
add_definitions(-DWITH_LZO)
endif()