diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2013-05-21 13:38:24 +0400 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2013-05-22 02:15:13 +0400 |
| commit | 095bfd748766966f5515bdfe64867d6a09287123 (patch) | |
| tree | d427bc78dd5abd529ce6797ee9ababc495744482 | |
| parent | ccf1a2ba5fbd2a7d71be3e9bb895e3f2ac45e9b5 (diff) | |
cmake: Update Windows resources to reflect the optional vendor string
Make InternalName and OriginalFilename resources reflect the name of the compiled binary.
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/win32/git2.rc.cmake (renamed from src/win32/git2.rc) | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0499dc90a..016d77ad1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -321,8 +321,19 @@ 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 b/src/win32/git2.rc.cmake index 436913228..dc9b3e6eb 100644 --- a/src/win32/git2.rc +++ b/src/win32/git2.rc.cmake @@ -1,11 +1,7 @@ #include <winver.h> #include "../../include/git2/version.h" -#ifndef INCLUDE_LIB -#define LIBGIT2_FILENAME "git2.dll" -#else -#define LIBGIT2_FILENAME "libgit2.dll" -#endif +#define LIBGIT2_FILENAME "@LIBGIT2_NAME_PREFIX@git2@LIBGIT2_NAME_SUFFIX@.dll" VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE FILEVERSION LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,0 |