Revision: 8929 https://osdn.net/projects/ttssh2/scm/svn/commits/8929 Author: zmatsuo Date: 2020-09-05 00:53:44 +0900 (Sat, 05 Sep 2020) Log Message: ----------- buildinfo.txt にビルド時の情報を出力 - version_info.h.inから変更 Modified Paths: -------------- trunk/CMakeLists.txt trunk/ci_scripts/appveyor.yml Added Paths: ----------- trunk/buildinfo.txt.in Removed Paths: ------------- trunk/version_info.h.in -------------- next part -------------- Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2020-08-28 15:42:49 UTC (rev 8928) +++ trunk/CMakeLists.txt 2020-09-04 15:53:44 UTC (rev 8929) @@ -103,10 +103,6 @@ # build without svn,git? #set(SVNVERSION "0000") endif() -configure_file( - version_info.h.in - version_info.h - @ONLY) message("revision=\"${SVNVERSION}\"") ### tool @@ -145,6 +141,12 @@ endif() set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/${SNAPSHOT_DIR}") +### create buildinfo.txt +configure_file( + buildinfo.txt.in + buildinfo.txt + @ONLY) + ### subdirectories add_subdirectory(svnrev_perl) add_subdirectory(teraterm) Added: trunk/buildinfo.txt.in =================================================================== --- trunk/buildinfo.txt.in (rev 0) +++ trunk/buildinfo.txt.in 2020-09-04 15:53:44 UTC (rev 8929) @@ -0,0 +1,60 @@ + +SVNVERSION + @SVNVERSION@ +MSVC + @MSVC@ +MINGW + @MINGW@ +_WIN32_WINNT + @_WIN32_WINNT@ +CMAKE_GENERATOR + @CMAKE_GENERATOR@ +CMAKE_GENERATOR_PLATFORM + @CMAKE_GENERATOR_PLATFORM@ +CMAKE_GENERATOR_TOOLSET (VS 2010 and above) + @CMAKE_GENERATOR_TOOLSET@ +CMAKE_VS_PLATFORM_TOOLSET + @CMAKE_VS_PLATFORM_TOOLSET@ +CMAKE_BUILD_TYPE (single-configuration generator) + @CMAKE_BUILD_TYPE@ +CMAKE_COMMAND + @CMAKE_COMMAND@ +CMAKE_C_COMPILER + @CMAKE_C_COMPILER@ +CMAKE_CXX_COMPILER + @CMAKE_CXX_COMPILER@ +CMAKE_C_FLAGS + @CMAKE_C_FLAGS@ +CMAKE_C_FLAGS_RELEASE + @CMAKE_C_FLAGS_RELEASE@ +CMAKE_C_FLAGS_DEBUG + @CMAKE_C_FLAGS_DEBUG@ +CMAKE_CXX_FLAGS + @CMAKE_CXX_FLAGS@ +CMAKE_CXX_FLAGS_RELEASE + @CMAKE_CXX_FLAGS_RELEASE@ +CMAKE_CXX_FLAGS_DEBUG + @CMAKE_CXX_FLAGS_DEBUG@ +CMAKE_EXE_LINKER_FLAGS + @CMAKE_EXE_LINKER_FLAGS@ +CMAKE_EXE_LINKER_FLAGS_RELEASE + @CMAKE_EXE_LINKER_FLAGS_RELEASE@ +CMAKE_EXE_LINKER_FLAGS_DEBUG + @CMAKE_EXE_LINKER_FLAGS_DEBUG@ +CMAKE_SHARED_LINKER_FLAGS + @CMAKE_SHARED_LINKER_FLAGS@ +CMAKE_SHARED_LINKER_FLAGS_RELEASE + @CMAKE_SHARED_LINKER_FLAGS_RELEASE@ +CMAKE_SHARED_LINKER_FLAGS_DEBUG + @CMAKE_SHARED_LINKER_FLAGS_DEBUG@ + +perl + @PERL@ +Subversion_SVN_EXECUTABLE(SVN) + @Subversion_SVN_EXECUTABLE@ +git + @GIT_EXECUTABLE@ +ISCC(inno setup) + @ISCC@ + +see CMakeCache.txt for more details Modified: trunk/ci_scripts/appveyor.yml =================================================================== --- trunk/ci_scripts/appveyor.yml 2020-08-28 15:42:49 UTC (rev 8928) +++ trunk/ci_scripts/appveyor.yml 2020-09-04 15:53:44 UTC (rev 8929) @@ -98,3 +98,4 @@ artifacts: - path: build\%ZIP_FILE% + - path: build\buildinfo.txt Deleted: trunk/version_info.h.in =================================================================== --- trunk/version_info.h.in 2020-08-28 15:42:49 UTC (rev 8928) +++ trunk/version_info.h.in 2020-09-04 15:53:44 UTC (rev 8929) @@ -1,47 +0,0 @@ - -#cmakedefine SVNVERSION @SVNVERSION@ - -// infos when generated -#cmakedefine MSVC -#cmakedefine MINGW -// _WIN32_WINNT -// @_WIN32_WINNT@ -// CMAKE_GENERATOR -// @CMAKE_GENERATOR@ -// CMAKE_GENERATOR_TOOLSET (VS 2010 and above) -// @CMAKE_GENERATOR_TOOLSET@ -// CMAKE_BUILD_TYPE (single-configuration generator) -// @CMAKE_BUILD_TYPE@ -// CMAKE_COMMAND -// @CMAKE_COMMAND@ -// CMAKE_C_COMPILER -// @CMAKE_C_COMPILER@ -// CMAKE_CXX_COMPILER -// @CMAKE_CXX_COMPILER@ -// CMAKE_C_FLAGS -// @CMAKE_C_FLAGS@ -// CMAKE_C_FLAGS_RELEASE -// @CMAKE_C_FLAGS_RELEASE@ -// CMAKE_C_FLAGS_DEBUG -// @CMAKE_C_FLAGS_DEBUG@ -// CMAKE_CXX_FLAGS -// @CMAKE_CXX_FLAGS@ -// CMAKE_CXX_FLAGS_RELEASE -// @CMAKE_CXX_FLAGS_RELEASE@ -// CMAKE_CXX_FLAGS_DEBUG -// @CMAKE_CXX_FLAGS_DEBUG@ -// CMAKE_EXE_LINKER_FLAGS -// @CMAKE_EXE_LINKER_FLAGS@ -// CMAKE_EXE_LINKER_FLAGS_RELEASE -// @CMAKE_EXE_LINKER_FLAGS_RELEASE@ -// CMAKE_EXE_LINKER_FLAGS_DEBUG -// @CMAKE_EXE_LINKER_FLAGS_DEBUG@ -// CMAKE_SHARED_LINKER_FLAGS -// @CMAKE_SHARED_LINKER_FLAGS@ -// CMAKE_SHARED_LINKER_FLAGS_RELEASE -// @CMAKE_SHARED_LINKER_FLAGS_RELEASE@ -// CMAKE_SHARED_LINKER_FLAGS_DEBUG -// @CMAKE_SHARED_LINKER_FLAGS_DEBUG@ -// -// see CMakeCache.txt for more details -