diff options
| author | HanzZ <hanzz.k@gmail.com> | 2011-10-23 15:07:26 +0400 |
|---|---|---|
| committer | HanzZ <hanzz.k@gmail.com> | 2011-10-23 15:07:26 +0400 |
| commit | 81beee07a288ce4ac4f21c7a984707358073f6cb (patch) | |
| tree | 920aabbbf9a07eed0eeb2e980ec7a64d42caa0ff /cmake_modules | |
| parent | bb938d33f7518b1009edffa837882e95f85b9766 (diff) | |
Libpurple backend compiles on Windows, yay! thanks _vt
Diffstat (limited to 'cmake_modules')
| -rw-r--r-- | cmake_modules/SwiftenConfig.cmake | 4 | ||||
| -rw-r--r-- | cmake_modules/glibConfig.cmake | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/cmake_modules/SwiftenConfig.cmake b/cmake_modules/SwiftenConfig.cmake index 278594aa..f693e1ed 100644 --- a/cmake_modules/SwiftenConfig.cmake +++ b/cmake_modules/SwiftenConfig.cmake @@ -16,8 +16,8 @@ if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR ) STRING(SUBSTRING ${f} 0 2 f_out) STRING(COMPARE EQUAL ${f_out} "/L" IS_PATH) if(${IS_PATH}) - message(${f}) - string(REGEX REPLACE "/LIBPATH:" "" f_replaced ${f}) + string(REGEX REPLACE "/LIBPATH:" "" f_replaced "${f}") + message("Added link directory: ${f_replaced}") link_directories(${f_replaced}) else() list(APPEND SWIFTEN_LIBRARY ${f}) diff --git a/cmake_modules/glibConfig.cmake b/cmake_modules/glibConfig.cmake index 0c3d791e..a160dc6d 100644 --- a/cmake_modules/glibConfig.cmake +++ b/cmake_modules/glibConfig.cmake @@ -22,13 +22,19 @@ find_library(GLIB2_LIBRARIES find_library(GLIB2_THREAD NAMES gthread-2.0 PATHS ${PKG_GLIB_LIBRARY_DIRS} ) +find_library(GLIB2_OBJECT + NAMES gobject-2.0 + PATHS ${PKG_GLIB_LIBRARY_DIRS} ) +find_library(GLIB2_MODULE + NAMES gmodule-2.0 + PATHS ${PKG_GLIB_LIBRARY_DIRS} ) find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h PATH_SUFFIXES glib-2.0/include PATHS ${PKG_GLIB_INCLUDE_DIRS} ${PKG_GLIB_LIBRARIES} ${CMAKE_SYSTEM_LIBRARY_PATH}) if(GLIB2_THREAD) - set(GLIB2_LIBRARIES ${GLIB2_LIBRARIES} ${GLIB2_THREAD}) + set(GLIB2_LIBRARIES ${GLIB2_LIBRARIES} ${GLIB2_THREAD} ${GLIB2_MODULE} ${GLIB2_OBJECT}) else(GLIB2_THREAD) message( STATUS "Could NOT find gthread-2.0" ) endif(GLIB2_THREAD) |