45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index e7b54d036..381362c80 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -276,7 +276,7 @@ if(SONAME)
|
|
set_target_properties(git2 PROPERTIES VERSION ${libgit2_VERSION})
|
|
set_target_properties(git2 PROPERTIES SOVERSION "${libgit2_VERSION_MAJOR}.${libgit2_VERSION_MINOR}")
|
|
if(LIBGIT2_FILENAME)
|
|
- target_compile_definitions(git2 PRIVATE LIBGIT2_FILENAME=\"${LIBGIT2_FILENAME}\")
|
|
+ target_compile_definitions(git2 PRIVATE LIBGIT2_FILENAME=${LIBGIT2_FILENAME})
|
|
set_target_properties(git2 PROPERTIES OUTPUT_NAME ${LIBGIT2_FILENAME})
|
|
elseif(DEFINED LIBGIT2_PREFIX)
|
|
set_target_properties(git2 PROPERTIES PREFIX "${LIBGIT2_PREFIX}")
|
|
diff --git a/src/win32/git2.rc b/src/win32/git2.rc
|
|
index d273afd70..038c92998 100644
|
|
--- a/src/win32/git2.rc
|
|
+++ b/src/win32/git2.rc
|
|
@@ -2,23 +2,15 @@
|
|
#include "../../include/git2/version.h"
|
|
|
|
#ifndef LIBGIT2_FILENAME
|
|
-# ifdef __GNUC__
|
|
-# define LIBGIT2_FILENAME git2
|
|
-# else
|
|
-# define LIBGIT2_FILENAME "git2"
|
|
-# endif
|
|
+# define LIBGIT2_FILENAME git2
|
|
#endif
|
|
|
|
#ifndef LIBGIT2_COMMENTS
|
|
# define LIBGIT2_COMMENTS "For more information visit http://libgit2.github.com/"
|
|
#endif
|
|
|
|
-#ifdef __GNUC__
|
|
-# define _STR(x) #x
|
|
-# define STR(x) _STR(x)
|
|
-#else
|
|
-# define STR(x) x
|
|
-#endif
|
|
+#define _STR(x) #x
|
|
+#define STR(x) _STR(x)
|
|
|
|
#ifdef __GNUC__
|
|
VS_VERSION_INFO VERSIONINFO
|