diff options
author | Vicent Marti <tanoku@gmail.com> | 2013-06-12 21:14:04 +0200 |
---|---|---|
committer | Vicent Marti <tanoku@gmail.com> | 2013-06-12 21:14:04 +0200 |
commit | 5a6e45cc841194a61ccad1006ad4a4b9aa2ecbc5 (patch) | |
tree | 8a9ca0687021bcccdeef3c84ebf41e982d78aa6f | |
parent | 6de9b2ee14a2393fae3ed86c5a5d12712c83b083 (diff) | |
download | libgit2-5a6e45cc841194a61ccad1006ad4a4b9aa2ecbc5.tar.gz |
Revert "cmake: Update Windows resources to reflect the optional vendor string"
This reverts commit 095bfd748766966f5515bdfe64867d6a09287123.
-rw-r--r-- | CMakeLists.txt | 11 | ||||
-rw-r--r-- | src/win32/git2.rc (renamed from src/win32/git2.rc.cmake) | 6 |
2 files changed, 5 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b931dc5f1..f06a84299 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/src/win32/git2.rc.cmake b/src/win32/git2.rc index dc9b3e6eb..436913228 100644 --- a/src/win32/git2.rc.cmake +++ b/src/win32/git2.rc @@ -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 |