summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2020-06-02 17:01:18 +0200
committerSebastian Pipping <sebastian@pipping.org>2020-06-02 17:01:24 +0200
commitb047fc5db5b848b4d5a44dcb7ee91e4f1cba987f (patch)
tree498568c60efc8ffe01967c1ec43d8022e88aaeac
parentb18432b36778145e13923042c7442b7d834973fb (diff)
parent009d96a7f967b042f5e3352581b67a9979b18cb8 (diff)
downloaduriparser-b047fc5db5b848b4d5a44dcb7ee91e4f1cba987f.tar.gz
Merge branch 'SpaceIm-fix/lib-name-mingw' (#90)
-rw-r--r--CMakeLists.txt5
-rw-r--r--ChangeLog5
-rw-r--r--THANKS1
3 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70088b1..fde61e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,7 +157,10 @@ if(NOT MSVC)
set_property(TARGET uriparser PROPERTY VERSION ${URIPARSER_SO_CURRENT_MINUS_AGE}.${URIPARSER_SO_AGE}.${URIPARSER_SO_REVISION})
set_property(TARGET uriparser PROPERTY SOVERSION ${URIPARSER_SO_CURRENT_MINUS_AGE})
if(WIN32)
- set_property(TARGET uriparser PROPERTY SUFFIX "-${URIPARSER_SO_CURRENT_MINUS_AGE}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ set_target_properties(uriparser PROPERTIES
+ OUTPUT_NAME uriparser
+ RUNTIME_OUTPUT_NAME uriparser-${URIPARSER_SO_CURRENT_MINUS_AGE}
+ ARCHIVE_OUTPUT_NAME uriparser)
endif()
endif()
diff --git a/ChangeLog b/ChangeLog
index f1d3533..96c690f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@ NOTE: uriparser is looking for help with a few things:
https://github.com/uriparser/uriparser/labels/help%20wanted
If you can help, please get in touch. Thanks!
+20xx-xx-x -- x.x.x
+
+ * Fixed: MinGW: Fix name of static library (GitHub #90)
+ Thanks to SpaceIm for the patch and Sandro Mani for review!
+
2020-05-31 -- 0.9.4
* Fixed: testrunner: No longer crashes when compiled with NDEBUG (GitHub #67)
diff --git a/THANKS b/THANKS
index 8f34990..874d348 100644
--- a/THANKS
+++ b/THANKS
@@ -51,6 +51,7 @@ Sandro Mani
Schrijvers Luc
Scott Donelan
Sezai Tekin
+SpaceIm
Valentin Haenel
Vitaly Lipatov
Yang Yu