[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam] /: update gitversion.h properly
From:       Andi Clemens <andi.clemens () googlemail ! com>
Date:       2011-12-31 15:51:12
Message-ID: 20111231155112.92523A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit a26b1da253cb5be4b37bdaba16c1a054f1729898 by Andi Clemens.
Committed on 31/12/2011 at 13:02.
Pushed by aclemens into branch 'master'.

update gitversion.h properly

the file was never updated correctly, only when it has been manually removed
from the binary dir.
Also the version.h was never rebuild (I don't quite understand, why), even if
it was changed directly in the build directory. Somehow the dependency handling
was broken.

To fix this, the build directory needs to be completely removed after this
commit (make clean is not enough).

M  +1    -6    CMakeLists.txt

http://commits.kde.org/digikam/a26b1da253cb5be4b37bdaba16c1a054f1729898

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57bd386..d6077e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -484,13 +484,8 @@ IF(DIGIKAM_CAN_BE_COMPILED)
                    "${CMAKE_CURRENT_BINARY_DIR}/gitscript.cmake"
                    @ONLY)
 
-    ADD_CUSTOM_COMMAND(OUTPUT \
                "${CMAKE_CURRENT_BINARY_DIR}/digikam/utils/gitversion.h"
-                       DEPENDS ${GIT_MARKER}
-                       COMMAND ${CMAKE_COMMAND} -P \
                "${CMAKE_CURRENT_BINARY_DIR}/gitscript.cmake")
-
     # Add a custom target to drive the custom command.
-    ADD_CUSTOM_TARGET(digikam-gitversion
-                      ALL DEPENDS \
"${CMAKE_CURRENT_BINARY_DIR}/digikam/utils/gitversion.h") +    \
ADD_CUSTOM_TARGET(digikam-gitversion ALL COMMAND ${CMAKE_COMMAND} -P \
"${CMAKE_CURRENT_BINARY_DIR}/gitscript.cmake")  
     # ==================================================================================================
  # get the gcc version


[prev in list] [next in list] [prev in thread] [next in thread]