diff --git a/AUTHORS.txt b/AUTHORS.txt index 9033f39e8..9d3124cc2 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -5,6 +5,7 @@ Project initiator: Developement contributors, in last name alphabetical order: Oliver Duis + Michael Ezra Jean-Christophe Frisch Steve Herrell Emil Martinec @@ -21,8 +22,7 @@ Other contributors (ideas, mockups, testing, forum activity, translations, etc.) Patrik Brunner Fernando Carello Maciek Dworak - Michael Ezra - David M. Gyurko + M. Dávid Gyurkó Arturs Jekabsons Karl Loncarek Paul Matthijsse diff --git a/About-Apple.cmake b/About-Apple.cmake index c9c379c16..85a489aa3 100644 --- a/About-Apple.cmake +++ b/About-Apple.cmake @@ -7,11 +7,15 @@ set (OUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/AboutThisBuild.txt") set (VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h") set (SHELL "/bin/bash") +# if AboutThisBuild.txt has to be deleted, i guess that it's also the case for version.txt... add_custom_target (AboutFile ALL + COMMAND rm -f ${OUT_FILE} + COMMAND rm -f ${VERSION_FILE} COMMAND for i in \$\( hg branch \)\; do echo Branch: $i >${OUT_FILE}\; done COMMAND hg parents --template=\"Version: {latesttag}_{latesttagdistance}\\nChangset: {node}\\n\" >>${OUT_FILE} COMMAND for i in \$\( gcc -dumpversion \) \;do echo Compiler: GCC $i >>${OUT_FILE} \; done COMMAND echo Processor: ${PROC_LABEL} >>${OUT_FILE} + COMMAND echo Bit depth: ${PROC_BIT_DEPTH} >>${OUT_FILE} COMMAND echo Gtkmm: V${GTKMM_VERSION} >>${OUT_FILE} COMMAND echo Build flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_CMAKE_BUILD_TYPE}} >>${OUT_FILE} COMMAND echo Link flags: ${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${UPPER_CMAKE_BUILD_TYPE}} >>${OUT_FILE} diff --git a/About-Linux.cmake b/About-Linux.cmake index c9c379c16..85a489aa3 100644 --- a/About-Linux.cmake +++ b/About-Linux.cmake @@ -7,11 +7,15 @@ set (OUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/AboutThisBuild.txt") set (VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h") set (SHELL "/bin/bash") +# if AboutThisBuild.txt has to be deleted, i guess that it's also the case for version.txt... add_custom_target (AboutFile ALL + COMMAND rm -f ${OUT_FILE} + COMMAND rm -f ${VERSION_FILE} COMMAND for i in \$\( hg branch \)\; do echo Branch: $i >${OUT_FILE}\; done COMMAND hg parents --template=\"Version: {latesttag}_{latesttagdistance}\\nChangset: {node}\\n\" >>${OUT_FILE} COMMAND for i in \$\( gcc -dumpversion \) \;do echo Compiler: GCC $i >>${OUT_FILE} \; done COMMAND echo Processor: ${PROC_LABEL} >>${OUT_FILE} + COMMAND echo Bit depth: ${PROC_BIT_DEPTH} >>${OUT_FILE} COMMAND echo Gtkmm: V${GTKMM_VERSION} >>${OUT_FILE} COMMAND echo Build flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_CMAKE_BUILD_TYPE}} >>${OUT_FILE} COMMAND echo Link flags: ${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${UPPER_CMAKE_BUILD_TYPE}} >>${OUT_FILE} diff --git a/About-Windows.cmake b/About-Windows.cmake index 6b75dfcb7..b3a572192 100644 --- a/About-Windows.cmake +++ b/About-Windows.cmake @@ -11,6 +11,7 @@ add_custom_target (AboutFile ALL COMMAND hg parents --template=\"Version: {latesttag}_{latesttagdistance}\\nChangset: {node}\\n\" >>${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} COMMAND \(echo Gtkmm: V${GTKMM_VERSION}\) >>${OUT_FILE} COMMAND \(echo Build flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_CMAKE_BUILD_TYPE}} \) >>${OUT_FILE} COMMAND \(echo Link flags: ${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${UPPER_CMAKE_BUILD_TYPE}} \) >>${OUT_FILE} diff --git a/CMakeLists.txt b/CMakeLists.txt index a677a6692..2f18493df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,6 +133,13 @@ else (WIN32) find_package (ZLIB REQUIRED) endif (WIN32) +# set the bit number information of the platform +if (CMAKE_SIZEOF_VOID_P EQUAL 4) + set(PROC_BIT_DEPTH 32 bits) +elseif (CMAKE_SIZEOF_VOID_P EQUAL 8) + set(PROC_BIT_DEPTH 64 bits) +endif (CMAKE_SIZEOF_VOID_P EQUAL 4) + #generating AboutThisBuild.txt if (WIN32) include (About-Windows.cmake)