From 75f0e64cc77f5a885727014aaefa6144411a4d8b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 6 Feb 2009 08:46:02 +0000 Subject: [PATCH] Added support for VS versioning of OpenThreads --- CMakeLists.txt | 6 +- ....rc.in => OpenSceneGraphVersionInfo.rc.in} | 0 .../Windows/OpenThreadsVersionInfo.rc.in | 117 ++++++++++++++++++ src/OpenThreads/CMakeLists.txt | 11 ++ src/OpenThreads/win32/CMakeLists.txt | 1 + 5 files changed, 132 insertions(+), 3 deletions(-) rename PlatformSpecifics/Windows/{VersionInfo.rc.in => OpenSceneGraphVersionInfo.rc.in} (100%) create mode 100644 PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 200d6ec37..0f287dbe1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ endif(COMMAND cmake_policy) PROJECT(OpenSceneGraph) SET(OPENSCENEGRAPH_MAJOR_VERSION 2) -SET(OPENSCENEGRAPH_MINOR_VERSION 8) +SET(OPENSCENEGRAPH_MINOR_VERSION 9) SET(OPENSCENEGRAPH_PATCH_VERSION 0) SET(OPENSCENEGRAPH_SOVERSION 55) @@ -275,8 +275,8 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Config.in" # Set Version Info resource file IF(MSVC) - SET(OPENSCENEGRAPH_VERSIONINFO_RC "${PROJECT_BINARY_DIR}/PlatformSpecifics/Windows/VersionInfo.rc") - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/PlatformSpecifics/Windows/VersionInfo.rc.in" + SET(OPENSCENEGRAPH_VERSIONINFO_RC "${PROJECT_BINARY_DIR}/PlatformSpecifics/Windows/OpenSceneGraphVersionInfo.rc") + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/PlatformSpecifics/Windows/OpenSceneGraphVersionInfo.rc.in" "${OPENSCENEGRAPH_VERSIONINFO_RC}") ENDIF(MSVC) diff --git a/PlatformSpecifics/Windows/VersionInfo.rc.in b/PlatformSpecifics/Windows/OpenSceneGraphVersionInfo.rc.in similarity index 100% rename from PlatformSpecifics/Windows/VersionInfo.rc.in rename to PlatformSpecifics/Windows/OpenSceneGraphVersionInfo.rc.in diff --git a/PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc.in b/PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc.in new file mode 100644 index 000000000..1e63344ff --- /dev/null +++ b/PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc.in @@ -0,0 +1,117 @@ +// Microsoft Visual C++ generated resource script. +// + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 1 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +//OLD - Visual C++ generated script +//1 TEXTINCLUDE +//BEGIN +// "resource.h\0" +//END +// +//2 TEXTINCLUDE +//BEGIN +// "#include ""afxres.h""\r\n" +// "\0" +//END +// +//3 TEXTINCLUDE +//BEGIN +// "\r\n" +// "\0" +//END +// +//NEW +1 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +2 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + + + + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION ${OPENTHREADS_MAJOR_VERSION}, ${OPENTHREADS_MINOR_VERSION}, ${OPENTHREADS_PATCH_VERSION}, ${OPENTHREADS_SOVERSION} + PRODUCTVERSION ${OPENTHREADS_MAJOR_VERSION}, ${OPENTHREADS_MINOR_VERSION}, ${OPENTHREADS_PATCH_VERSION}, ${OPENTHREADS_SOVERSION} + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x0L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "OPENTHREADS Binary" + VALUE "FileVersion", "${OPENTHREADS_MAJOR_VERSION}, ${OPENTHREADS_MINOR_VERSION}, ${OPENTHREADS_PATCH_VERSION}, ${OPENTHREADS_SOVERSION}" + VALUE "InternalName", "OSG" + VALUE "LegalCopyright", "Copyright (C) 2009" + VALUE "OriginalFilename", "" + VALUE "ProductName", "OPENTHREADS" + VALUE "ProductVersion", "${OPENTHREADS_MAJOR_VERSION}, ${OPENTHREADS_MINOR_VERSION}, ${OPENTHREADS_PATCH_VERSION}, ${OPENTHREADS_SOVERSION}" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/src/OpenThreads/CMakeLists.txt b/src/OpenThreads/CMakeLists.txt index 29c515388..dece76827 100644 --- a/src/OpenThreads/CMakeLists.txt +++ b/src/OpenThreads/CMakeLists.txt @@ -27,6 +27,17 @@ SET(OPENTHREADS_CONFIG_HEADER "${PROJECT_BINARY_DIR}/include/OpenThreads/Config" CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/common/Config.in" "${OPENTHREADS_CONFIG_HEADER}") + +################################################################################ +# Set Version Info resource file + +IF(MSVC) + SET(OPENTHREADS_VERSIONINFO_RC "${PROJECT_BINARY_DIR}/PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc") + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc.in" + "${OPENTHREADS_VERSIONINFO_RC}") +ENDIF(MSVC) + + # INSTALL_FILES(/include/OpenThreads/ FILES "${OPENTHREADS_CONFIG_HEADER}") ################################################################################ diff --git a/src/OpenThreads/win32/CMakeLists.txt b/src/OpenThreads/win32/CMakeLists.txt index 0622d4b57..1a1a27c55 100644 --- a/src/OpenThreads/win32/CMakeLists.txt +++ b/src/OpenThreads/win32/CMakeLists.txt @@ -21,6 +21,7 @@ ADD_LIBRARY(${LIB_NAME} Win32ThreadPrivateData.h ../common/Version.cpp ../common/Atomic.cpp + ${OPENTHREADS_VERSIONINFO_RC} )