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 similarity index 91% rename from src/win32/git2.rc.cmake rename to src/win32/git2.rc index dc9b3e6eb..436913228 100644 --- a/src/win32/git2.rc.cmake +++ b/src/win32/git2.rc @@ -1,7 +1,11 @@ #include #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