diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-04-24 15:42:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-04-25 12:27:45 +0300 |
| commit | beaa57d2699ae945c06a895d41ec5ddfeabc373a (patch) | |
| tree | 205db121401f06eb1d51a98cd2480b46ae52c582 /build_files | |
| parent | 935998312c44300385588c466ef31fa9e85d385f (diff) | |
Refactor BKE_blender into separate headers
- BKE_blender_version.h (only version defines & versionstr).
- BKE_blender_copybuffer.h (currently only used for view3d copy/paste).
- BKE_blender_undo.h (global undo functions).
- BKE_blendfile.h (high level blend file read/write API).
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 2 | ||||
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 2 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 0f34551cfc8..4d7793d60c8 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -188,7 +188,7 @@ if 'cmake' in builder: sys.exit(retcode) if builder.startswith('linux') and target == 'cuda': - blender_h = os.path.join(blender_dir, "source", "blender", "blenkernel", "BKE_blender.h") + blender_h = os.path.join(blender_dir, "source", "blender", "blenkernel", "BKE_blender_version.h") blender_version = int(parse_header_file(blender_h, 'BLENDER_VERSION')) blender_version = "%d.%d" % (blender_version // 100, blender_version % 100) kernels = os.path.join(target_build_dir, 'intern', 'cycles', 'kernel') diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 4deb0b1a081..b27017568cb 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -130,7 +130,7 @@ if builder.find('cmake') != -1: blenderplayer = os.path.join(install_dir, 'blenderplayer') buildinfo_h = os.path.join(build_dir, "source", "creator", "buildinfo.h") - blender_h = os.path.join(blender_dir, "source", "blender", "blenkernel", "BKE_blender.h") + blender_h = os.path.join(blender_dir, "source", "blender", "blenkernel", "BKE_blender_version.h") # Get version information blender_version = int(parse_header_file(blender_h, 'BLENDER_VERSION')) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index f26b22a9c5f..7f19e22c39e 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -1096,10 +1096,10 @@ function(get_blender_version) # - BLENDER_VERSION_CYCLE (alpha, beta, rc, release) # So cmake depends on BKE_blender.h, beware of inf-loops! - CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h - ${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender.h.done) + CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender_version.h + ${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender_version.h.done) - file(STRINGS ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h _contents REGEX "^#define[ \t]+BLENDER_.*$") + file(STRINGS ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender_version.h _contents REGEX "^#define[ \t]+BLENDER_.*$") string(REGEX REPLACE ".*#define[ \t]+BLENDER_VERSION[ \t]+([0-9]+).*" "\\1" _out_version "${_contents}") string(REGEX REPLACE ".*#define[ \t]+BLENDER_SUBVERSION[ \t]+([0-9]+).*" "\\1" _out_subversion "${_contents}") |