[modules/Find{MicroHttpd,Json}.cmake] prefer dynamic library over sta…

…tic, (#587) Thanks!
volkszaehler · Mar 29, 2023 · 7ab8642 · 7ab8642
1 parent a91abe1
commit 7ab8642
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/modules/FindJson.cmake b/modules/FindJson.cmake
@@ -82,8 +82,8 @@ FIND_PATH(JSON-C_INCLUDE_DIR json-c/json.h
 IF(WIN32)
   SET(JSON_LIBRARY_NAMES ${JSON_LIBRARY_NAMES} libjson.lib)
 ELSE(WIN32)
-  SET(JSON_LIBRARY_NAMES ${JSON_LIBRARY_NAMES} libjson-c.a)
   SET(JSON_LIBRARY_NAMES ${JSON_LIBRARY_NAMES} libjson-c.so)
+  SET(JSON_LIBRARY_NAMES ${JSON_LIBRARY_NAMES} libjson-c.a)
 ENDIF(WIN32)
 FIND_LIBRARY(JSON_LIBRARY NAMES ${JSON_LIBRARY_NAMES}
   HINTS

diff --git a/modules/FindMicroHttpd.cmake b/modules/FindMicroHttpd.cmake
@@ -3,8 +3,7 @@
 # Usage of this module as follows:
 # This file defines:
 # * MICROHTTPD_FOUND if protoc was found
-# * MICROHTTPD_LIBRARY The lib to link to (currently only a static unix lib, not
-# portable)
+# * MICROHTTPD_LIBRARY The lib to link to
 # * MICROHTTPD_INCLUDE The include directories for libmicrohttpd.
 
 message(STATUS "FindMicrohttpd check")
@@ -81,8 +80,8 @@ FIND_PATH(MICROHTTPD_INCLUDE_DIR microhttpd.h
 IF(WIN32)
   SET(MICROHTTPD_LIBRARY_NAMES ${MICROHTTPD_LIBRARY_NAMES} libmicrohttpd.lib)
 ELSE(WIN32)
-  SET(MICROHTTPD_LIBRARY_NAMES ${MICROHTTPD_LIBRARY_NAMES} libmicrohttpd.a)
   SET(MICROHTTPD_LIBRARY_NAMES ${MICROHTTPD_LIBRARY_NAMES} libmicrohttpd.so)
+  SET(MICROHTTPD_LIBRARY_NAMES ${MICROHTTPD_LIBRARY_NAMES} libmicrohttpd.a)
 ENDIF(WIN32)
 FIND_LIBRARY(MICROHTTPD_LIBRARY NAMES ${MICROHTTPD_LIBRARY_NAMES}
   HINTS