Revert "cmake: Update Windows resources to reflect the optional vendor string"

This reverts commit 095bfd7487.
This commit is contained in:
Vicent Marti 2013-06-12 21:14:04 +02:00
parent 6de9b2ee14
commit 5a6e45cc84
2 changed files with 5 additions and 12 deletions

View File

@ -330,19 +330,8 @@ IF (SONAME)
SET_TARGET_PROPERTIES(git2 PROPERTIES OUTPUT_NAME "git2-${SONAME_APPEND}")
ENDIF()
ENDIF()
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libgit2.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libgit2.pc @ONLY)
IF (NOT BUILD_SHARED_LIBS)
SET(LIBGIT2_NAME_PREFIX "lib")
ENDIF()
IF (SONAME_APPEND)
SET(LIBGIT2_NAME_SUFFIX "-${SONAME_APPEND}")
ENDIF()
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/src/win32/git2.rc.cmake ${WIN_RC} @ONLY)
IF (MSVC_IDE)
# Precompiled headers
SET_TARGET_PROPERTIES(git2 PROPERTIES COMPILE_FLAGS "/Yuprecompiled.h /FIprecompiled.h")

View File

@ -1,7 +1,11 @@
#include <winver.h>
#include "../../include/git2/version.h"
#define LIBGIT2_FILENAME "@LIBGIT2_NAME_PREFIX@git2@LIBGIT2_NAME_SUFFIX@.dll"
#ifndef INCLUDE_LIB
#define LIBGIT2_FILENAME "git2.dll"
#else
#define LIBGIT2_FILENAME "libgit2.dll"
#endif
VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
FILEVERSION LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,0