* Merged changes up to eAthena 15077.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15685 54d463be-8e91-2dee-dedb-b68131a5f0ec

src/common/CMakeLists.txt

@@ -96,7 +96,7 @@ set( COMMON_BASE_SOURCES
 	"${COMMON_SOURCE_DIR}/timer.c"
 	"${COMMON_SOURCE_DIR}/utils.c"
 	CACHE INTERNAL "common_base sources" )
-set( LIBRARIES ${ZLIB_LIBRARIES} )
+set( LIBRARIES ${GLOBAL_LIBRARIES} ${ZLIB_LIBRARIES} )
 set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${MT19937AR_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${LIBCONFIG_INCLUDE_DIRS} )
 set( DEFINITIONS "${GLOBAL_DEFINITIONS}" )
 set( SOURCE_FILES ${MT19937AR_HEADERS} ${MT19937AR_SOURCES} ${COMMON_BASE_HEADERS} ${COMMON_BASE_SOURCES} )
@@ -128,7 +128,7 @@ set( COMMON_SQL_SOURCES
 	"${CMAKE_CURRENT_SOURCE_DIR}/sql.c"
 	CACHE INTERNAL "common_sql sources" )
 set( DEPENDENCIES common_base )
-set( LIBRARIES ${MYSQL_LIBRARIES} )
+set( LIBRARIES ${GLOBAL_LIBRARIES} ${MYSQL_LIBRARIES} )
 set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${MYSQL_INCLUDE_DIRS} )
 set( DEFINITIONS "${GLOBAL_DEFINITIONS}" )
 set( SOURCE_FILES ${COMMON_SQL_HEADERS} ${COMMON_SQL_SOURCES} )