From 40d4da829cb234c013e857aee4e85902799c87f5 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 20 Jul 2015 23:17:06 +1000 Subject: Fix/Workaround for CMake buildinfo error 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. --- source/creator/CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'source/creator') diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 2dc995abb76..f0b6001cca1 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -167,12 +167,19 @@ if(WITH_BUILDINFO) # include the output directory, where the buildinfo.h file is generated 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 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 - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/buildinfo.h + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_buildinfo.h COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_SOURCE_DIR} -P ${CMAKE_SOURCE_DIR}/build_files/cmake/buildinfo.cmake) -- cgit v1.2.3