From 13c8e189f61dbb342039d3811d3e80879c99f62c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 30 Sep 2008 05:05:50 +0000 Subject: [PATCH] WITH_ELBEEM diabled wasnt working with cmake --- source/blender/blenkernel/CMakeLists.txt | 3 +++ source/blender/src/CMakeLists.txt | 3 +++ source/creator/CMakeLists.txt | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 0345711c9c3..c3cbc36a94f 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -73,3 +73,6 @@ IF(WITH_INTERNATIONAL) ADD_DEFINITIONS(-DWITH_FREETYPE2) ENDIF(WITH_INTERNATIONAL) +IF(NOT WITH_ELBEEM) + ADD_DEFINITIONS(-DDISABLE_ELBEEM) +ENDIF(NOT WITH_ELBEEM) diff --git a/source/blender/src/CMakeLists.txt b/source/blender/src/CMakeLists.txt index d95551940f8..e2757dbc75d 100644 --- a/source/blender/src/CMakeLists.txt +++ b/source/blender/src/CMakeLists.txt @@ -80,3 +80,6 @@ IF(WITH_VERSE) ADD_DEPENDENCIES(src mkprot verse) ENDIF(WITH_VERSE) +IF(NOT WITH_ELBEEM) + ADD_DEFINITIONS(-DDISABLE_ELBEEM) +ENDIF(NOT WITH_ELBEEM) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 99e8b576412..5109fbc0930 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -187,7 +187,11 @@ ADD_DEPENDENCIES(blender makesdna) FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS) -SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} src blender_python blender_render blender_radiosity bf_elbeem) +SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} src blender_python blender_render blender_radiosity) + +IF(WITH_ELBEEM) + SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_elbeem) +ENDIF(WITH_ELBEEM) IF(CMAKE_SYSTEM_NAME MATCHES "Linux") SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)