From 47866f60652d745e57cf3adca68b8dfc59aecc69 Mon Sep 17 00:00:00 2001 From: Aleos Date: Fri, 15 Feb 2019 23:10:17 -0500 Subject: [PATCH] Cleaned up cmake output (#3941) * Follow up to d649ede. * Renamed svnversion.h to version.hpp. --- .gitignore | 1 + doc/script_commands.txt | 2 +- src/common/CMakeLists.txt | 17 ++++++++--------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 4f7a6cd913..b51e1b59bc 100644 --- a/.gitignore +++ b/.gitignore @@ -71,6 +71,7 @@ Thumbs.db /src/common/Makefile /src/common/obj_all /src/common/obj_sql +/src/common/version.hpp # /src/custom/ /src/custom diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 9710a1efc1..c0b7535993 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -7514,7 +7514,7 @@ must be used. This command makes an object display an emotion sprite above their own as if they were doing that emotion. For a full list of emotion numbers, -see 'src/map/script_constants.pph' under 'ET_'. The not so obvious ones are 'ET_QUESTION' +see 'src/map/script_constants.hpp' under 'ET_'. The not so obvious ones are 'ET_QUESTION' (a question mark) and 'ET_SURPRISE' (the exclamation mark). The optional target parameter specifies who will get the emotion on top of diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 19c1896b1b..cde9395bce 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -1,9 +1,8 @@ # -# Create svnversion.h -# tbd, could be rename version.h +# Create version.hpp # -message( STATUS "Creating svnversion.h" ) +message( STATUS "Creating version.hpp" ) if(GIT_VERSION) # those 2 was done in parent to produce this #include(GetGitVersion) @@ -12,23 +11,23 @@ if(GIT_VERSION) string(SUBSTRING ${GIT_HEAD_VERSION} 0 10 SHORT_GIT_HEAD_VERSION) string(CONCAT GIT_STR_VERSIONS ${SHORT_GIT_VERSION} "_" ${SHORT_GIT_HEAD_VERSION}) #message( STATUS "git version=${GIT_STR_VERSIONS}" ) - file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h + file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.hpp "#ifndef SVNVERSION\n#define SVNVERSION ${GIT_STR_VERSIONS}\n#endif\n" ) elseif( SVNVERSION ) - file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h + file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.hpp "#ifndef SVNVERSION\n#define SVNVERSION ${SVNVERSION}\n#endif\n" ) else() - file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h "" ) + file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.hpp "" ) endif() set( GLOBAL_INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} CACHE INTERNAL "" ) set( SVNVERSION ${SVNVERSION} CACHE STRING "SVN version of the source code" ) if( INSTALL_COMPONENT_DEVELOPMENT ) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/version.hpp DESTINATION "src/common" COMPONENT Development_base ) endif( INSTALL_COMPONENT_DEVELOPMENT ) -message( STATUS "Creating svnversion.h - done" ) +message( STATUS "Creating version.hpp - done" ) ##################################################################### @@ -52,7 +51,7 @@ set( COMMON_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" mark_as_advanced( COMMON_SOURCE_DIR ) set( COMMON_ALL_HEADERS - "${CMAKE_CURRENT_BINARY_DIR}/svnversion.h" + "${CMAKE_CURRENT_BINARY_DIR}/version.hpp" "${COMMON_SOURCE_DIR}/cbasetypes.hpp" "${COMMON_SOURCE_DIR}/mmo.hpp" )