[Bf-blender-cvs] [40d4da8] master: Fix/Workaround for CMake buildinfo error
Campbell Barton
noreply at git.blender.org
Mon Jul 20 15:32:31 CEST 2015
Commit: 40d4da829cb234c013e857aee4e85902799c87f5
Author: Campbell Barton
Date: Mon Jul 20 23:17:06 2015 +1000
Branches: master
https://developer.blender.org/rB40d4da829cb234c013e857aee4e85902799c87f5
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.
===================================================================
M source/creator/CMakeLists.txt
===================================================================
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 2dc995a..f0b6001 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)
More information about the Bf-blender-cvs
mailing list