Skip to content
This repository was archived by the owner on Aug 26, 2024. It is now read-only.

Commit 69cdc54

Browse files
author
jan.kneschke@oracle.com
committed
pass LIBINTL_LIBRARY_DIRS down from the command-line
fixes LINK : fatal error LNK1104: cannot open file 'intl.lib' on windows if libintl is in non-standard locations libintl is a dep of glib
1 parent 464e860 commit 69cdc54

File tree

7 files changed

+8
-0
lines changed

7 files changed

+8
-0
lines changed

lib/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ INSTALL(FILES
2727

2828
INCLUDE_DIRECTORIES(${GLIB_INCLUDE_DIRS})
2929
LINK_DIRECTORIES(${GLIB_LIBRARY_DIRS})
30+
LINK_DIRECTORIES(${LIBINTL_LIBRARY_DIRS})
3031

3132
INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIRS})
3233
LINK_DIRECTORIES(${LUA_LIBRARY_DIRS})

plugins/admin/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ INCLUDE_DIRECTORIES(${EVENT_INCLUDE_DIRS})
88

99
LINK_DIRECTORIES(${LUA_LIBRARY_DIRS})
1010
LINK_DIRECTORIES(${GLIB_LIBRARY_DIRS})
11+
LINK_DIRECTORIES(${LIBINTL_LIBRARY_DIRS})
1112

1213
SET(_plugin_name admin)
1314
ADD_LIBRARY(${_plugin_name} SHARED "${_plugin_name}-plugin.c")

plugins/debug/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ INCLUDE_DIRECTORIES(${EVENT_INCLUDE_DIRS})
88

99
LINK_DIRECTORIES(${LUA_LIBRARY_DIRS})
1010
LINK_DIRECTORIES(${GLIB_LIBRARY_DIRS})
11+
LINK_DIRECTORIES(${LIBINTL_LIBRARY_DIRS})
1112

1213
SET(_plugin_name debug)
1314
ADD_LIBRARY(${_plugin_name} SHARED "${_plugin_name}-plugin.c")

plugins/proxy/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ INCLUDE_DIRECTORIES(${EVENT_INCLUDE_DIRS})
88

99
LINK_DIRECTORIES(${LUA_LIBRARY_DIRS})
1010
LINK_DIRECTORIES(${GLIB_LIBRARY_DIRS})
11+
LINK_DIRECTORIES(${LIBINTL_LIBRARY_DIRS})
1112

1213
SET(_plugin_name proxy)
1314
ADD_LIBRARY(${_plugin_name} SHARED "${_plugin_name}-plugin.c")

plugins/replicant/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ INCLUDE_DIRECTORIES(${EVENT_INCLUDE_DIRS})
88

99
LINK_DIRECTORIES(${LUA_LIBRARY_DIRS})
1010
LINK_DIRECTORIES(${GLIB_LIBRARY_DIRS})
11+
LINK_DIRECTORIES(${LIBINTL_LIBRARY_DIRS})
1112

1213
SET(_plugin_name replicant)
1314
ADD_LIBRARY(${_plugin_name} SHARED "${_plugin_name}-plugin.c")

src/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ LINK_DIRECTORIES(${LUA_LIBRARY_DIRS})
3333
INCLUDE_DIRECTORIES(${EVENT_INCLUDE_DIRS})
3434
LINK_DIRECTORIES(${EVENT_LIBRARY_DIRS})
3535

36+
LINK_DIRECTORIES(${LIBINTL_LIBRARY_DIRS})
37+
3638
STRING(REPLACE "." "" SHARED_LIBRARY_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
3739
ADD_DEFINITIONS(-DSHARED_LIBRARY_SUFFIX="${SHARED_LIBRARY_SUFFIX}")
3840

tests/unit/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ INCLUDE_DIRECTORIES(${EVENT_INCLUDE_DIRS})
1111
LINK_DIRECTORIES(${MYSQL_LIBRARY_DIRS})
1212
LINK_DIRECTORIES(${LUA_LIBRARY_DIRS})
1313
LINK_DIRECTORIES(${GLIB_LIBRARY_DIRS})
14+
LINK_DIRECTORIES(${LIBINTL_LIBRARY_DIRS})
1415
LINK_DIRECTORIES(${EVENT_LIBRARY_DIRS})
1516

1617
SET(WINSOCK_LIBRARIES)

0 commit comments

Comments
 (0)