Am Sonntag 27 Juni 2010 schrieb Yuv: > Hi Terry, > > On Jun 26, 8:14 pm, Tduell <[email protected]> wrote: > > You still have to run `cmake -DUPDATE_CHANGELOG=1` to intentionally > > update the ChangeLog. > > I've tried it. because I build out of tree, it did not work properly. > but it did turn the existing ChangeLog into an empty file: > > cd hugin.src > hg pull > hg update > cd ../hugin.build > cmake -DUPDATE_CHANGELOG=1 > > the relevant output messages: > > abort: There is no Mercurial repository here (.hg not found)! > -- New ChangeLog generated > > Yuv
I tried the attached patch on the main CMakeLists.txt, it looks ok. -- Kornel Benko [email protected]
diff -r a7c760281f3c CMakeLists.txt
--- a/CMakeLists.txt Sun Jun 27 15:00:43 2010 +1000
+++ b/CMakeLists.txt Sun Jun 27 10:04:57 2010 +0200
@@ -60,7 +60,9 @@
IF (EXISTS ${PROJECT_SOURCE_DIR}/.hg)
IF (UPDATE_CHANGELOG)
FIND_PROGRAM(_hg hg)
- EXECUTE_PROCESS(COMMAND ${_hg} log --follow --style=changelog OUTPUT_FILE ${PROJECT_SOURCE_DIR}/ChangeLog)
+ EXECUTE_PROCESS(COMMAND ${_hg} log --follow --style=changelog
+ WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
+ OUTPUT_FILE ${PROJECT_SOURCE_DIR}/ChangeLog)
MESSAGE("-- New ChangeLog generated")
ENDIF (UPDATE_CHANGELOG)
ENDIF (EXISTS ${PROJECT_SOURCE_DIR}/.hg)
@@ -442,7 +444,7 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "${V_MAJOR}")
SET(CPACK_PACKAGE_VERSION_MINOR "${V_MINOR}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${V_PATCH}")
+SET(CPACK_PACKAGE_VERSION_PATCH "${V_PATCH}.${CPACK_PACKAGE_VERSION_PATCH}")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${V_MAJOR}.${V_MINOR}")
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "hugin-${V_MAJOR}.${V_MINOR}.${V_PATCH}")
SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
signature.asc
Description: This is a digitally signed message part.
