[Groonga-commit] groonga/groonga at b1877c8 [master] windows: fix psapi.lib link usage

Back to archive index
Kouhei Sutou null+****@clear*****
Wed Mar 20 15:08:02 JST 2019


Kouhei Sutou	2019-03-20 15:08:02 +0900 (Wed, 20 Mar 2019)

  Revision: b1877c8ec686ed1399e976f992e0faab48a66e3f
  https://github.com/groonga/groonga/commit/b1877c8ec686ed1399e976f992e0faab48a66e3f

  Message:
    windows: fix psapi.lib link usage

  Modified files:
    CMakeLists.txt
    lib/CMakeLists.txt

  Modified: CMakeLists.txt (+2 -0)
===================================================================
--- CMakeLists.txt    2019-03-20 15:03:54 +0900 (339115c6b)
+++ CMakeLists.txt    2019-03-20 15:08:02 +0900 (3903cde66)
@@ -332,6 +332,8 @@ if(WIN32)
 
   SET(DBGHELP_LIBS "dbghelp.lib")
 
+  SET(PSAPI_LIBS "psapi.lib")
+
   set(USE_SELECT TRUE)
 else()
   ac_check_headers(sys/epoll.h)

  Modified: lib/CMakeLists.txt (+1 -7)
===================================================================
--- lib/CMakeLists.txt    2019-03-20 15:03:54 +0900 (c4a80bef1)
+++ lib/CMakeLists.txt    2019-03-20 15:08:02 +0900 (3fadf3e76)
@@ -103,15 +103,9 @@ set(GRN_ALL_LIBRARIES
     ${M_LIBS}
     ${WS2_32_LIBS}
     ${DBGHELP_LIBS}
+    ${PSAPI_LIBS}
     ${MRUBY_LIBS}
     ${ONIGMO_LIBS})
-if(WIN32)
-  list(APPEND GRN_ALL_LIBRARIES
-    -ladvapi32
-    -lws2_32
-    -lgdbhelp
-    -lpsapi)
-endif()
 if(GRN_EMBED)
   set(GRN_EMBEDDED_PLUGIN_LIBRARIES "")
   if(GRN_WITH_MECAB)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190320/c22b22de/attachment.html>


More information about the Groonga-commit mailing list
Back to archive index