[Bf-blender-cvs] [e67fd7a] master: Correct defines for binreloc
Campbell Barton
noreply at git.blender.org
Sun Dec 7 13:47:43 CET 2014
Commit: e67fd7a2cbf9723a0f800d9a14834ff6838f2b7f
Author: Campbell Barton
Date: Sun Dec 7 13:21:02 2014 +0100
Branches: master
https://developer.blender.org/rBe67fd7a2cbf9723a0f800d9a14834ff6838f2b7f
Correct defines for binreloc
After recent moving path functions to appdir.c
patch T42826: by ldo (Lawrence D'Oliveiro)
===================================================================
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenlib/CMakeLists.txt
===================================================================
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index fb717b1..5850b16 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -277,6 +277,13 @@ set(SRC
intern/pbvh_intern.h
)
+if(WITH_BINRELOC)
+ list(APPEND INC_SYS
+ ${BINRELOC_INCLUDE_DIRS}
+ )
+ add_definitions(-DWITH_BINRELOC)
+endif()
+
add_definitions(${GL_DEFINITIONS})
if(WIN32)
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 55a5d91..7dfcc2a 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -189,13 +189,6 @@ set(SRC
PIL_time_utildefines.h
)
-if(WITH_BINRELOC)
- list(APPEND INC_SYS
- ${BINRELOC_INCLUDE_DIRS}
- )
- add_definitions(-DWITH_BINRELOC)
-endif()
-
if(WITH_MEM_VALGRIND)
add_definitions(-DWITH_MEM_VALGRIND)
endif()
More information about the Bf-blender-cvs
mailing list