From 79a3d6c73fb7d051d7c92d29b09e80c0c25cdc90 Mon Sep 17 00:00:00 2001 From: natureh Date: Sun, 10 Apr 2011 12:17:14 +0200 Subject: [PATCH] Tagging the Defloat branch + updating the platform specific About-*.cmake scripts --- About-Apple.cmake | 4 ++-- About-Linux.cmake | 4 ++-- About-Windows.cmake | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/About-Apple.cmake b/About-Apple.cmake index 6e8e77e3b..87ae0a616 100644 --- a/About-Apple.cmake +++ b/About-Apple.cmake @@ -20,13 +20,13 @@ execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECT execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE) # build version.h from template -configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h) +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/rtgui/version.h) add_custom_target (AboutFile ALL COMMAND rm -f ${OUT_FILE} COMMAND echo Branch: `${HG_CMD} -R ${CMAKE_CURRENT_SOURCE_DIR} branch` >>${OUT_FILE} COMMAND echo Version: ${HG_VERSION} >>${OUT_FILE} - COMMAND echo Changeset: ${HG_CHANGESET} >>${OUT_FILE} + COMMAND echo Changset: ${HG_CHANGESET} >>${OUT_FILE} COMMAND echo Compiler: GCC `gcc -dumpversion` >>${OUT_FILE} COMMAND echo Processor: ${PROC_LABEL} >>${OUT_FILE} COMMAND echo Bit depth: ${PROC_BIT_DEPTH} >>${OUT_FILE} diff --git a/About-Linux.cmake b/About-Linux.cmake index f12e2bed4..e73e298aa 100644 --- a/About-Linux.cmake +++ b/About-Linux.cmake @@ -19,13 +19,13 @@ execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECT execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE) # build version.h from template -configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h) +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/rtgui/version.h) add_custom_target (AboutFile ALL COMMAND rm -f ${OUT_FILE} COMMAND echo Branch: `${HG_CMD} -R ${CMAKE_CURRENT_SOURCE_DIR} branch` >>${OUT_FILE} COMMAND echo Version: ${HG_VERSION} >>${OUT_FILE} - COMMAND echo Changeset: ${HG_CHANGESET} >>${OUT_FILE} + COMMAND echo Changset: ${HG_CHANGESET} >>${OUT_FILE} COMMAND echo Compiler: GCC `gcc -dumpversion` >>${OUT_FILE} COMMAND echo Processor: ${PROC_LABEL} >>${OUT_FILE} COMMAND echo Bit depth: ${PROC_BIT_DEPTH} >>${OUT_FILE} diff --git a/About-Windows.cmake b/About-Windows.cmake index af6df2727..cd12e9b45 100644 --- a/About-Windows.cmake +++ b/About-Windows.cmake @@ -10,12 +10,12 @@ execute_process(COMMAND hg parents --template={node|short} WORKING_DIRECTORY ${C execute_process(COMMAND hg parents --template={latesttagdistance} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE) # build version.h from template -configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h) +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/rtgui/version.h) add_custom_target (AboutFile ALL COMMAND for /F \"tokens=*\" %%i in \('hg -R \"${CMAKE_CURRENT_SOURCE_DIR}\" branch'\) do echo Branch: %%i >${OUT_FILE} COMMAND echo Version: ${HG_VERSION} >>${OUT_FILE} - COMMAND echo Changeset: ${HG_CHANGESET} >>${OUT_FILE} + COMMAND echo Changset: ${HG_CHANGESET} >>${OUT_FILE} COMMAND for /F \"tokens=*\" %%i in \('gcc -dumpversion'\) do echo Compiler: GCC%%i >>${OUT_FILE} COMMAND \(echo Processor: ${PROC_LABEL}\) >>${OUT_FILE} COMMAND \(echo Bit depth: ${PROC_BIT_DEPTH}\) >>${OUT_FILE}