Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix/Workaround for CMake buildinfo error

Browse Source 
Correcting the paths for buildinfo to point to the real header,
ended up breaking buildinfo (by not running every build).

It turns out we relied on the output _never_ existing,
so CMake generates a new buildinfo each time.
This is quite bad, but I didn't see a way for CMake to do this,
so explicitly point to a missing file and comment whats going on.
This commit is contained in:
Campbell Barton
2015-07-20 23:17:06 +10:00
parent 432d24f998
commit 40d4da829c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/creator/CMakeLists.txt
View File

@@ -167,12 +167,19 @@ if(WITH_BUILDINFO)
# include the output directory, where the buildinfo.h file is generated # include the output directory, where the buildinfo.h file is generated
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
# XXX, "_buildinfo.h" is used twice here,
# because we rely on that file being detected as missing
# every build so that the real header "buildinfo.h" is updated.
#
# Keep this until we find a better way to resolve!
# a custom target that is always built # a custom target that is always built
add_custom_target(buildinfo ALL add_custom_target(buildinfo ALL
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/buildinfo.h) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_buildinfo.h)
# creates buildinfo.h using cmake script # creates buildinfo.h using cmake script
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/buildinfo.h add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_buildinfo.h
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-DSOURCE_DIR=${CMAKE_SOURCE_DIR} -DSOURCE_DIR=${CMAKE_SOURCE_DIR}
-P ${CMAKE_SOURCE_DIR}/build_files/cmake/buildinfo.cmake) -P ${CMAKE_SOURCE_DIR}/build_files/cmake/buildinfo.cmake)