diff --git a/CMakeLists.txt b/CMakeLists.txt index 5980081e7e..b0b9a1f824 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -362,9 +362,18 @@ if(NOT DISABLE_WX) include(${wxWidgets_USE_FILE}) if(UNIX AND NOT APPLE) - include(FindGTK2) - if(GTK2_FOUND) - include_directories(${GTK2_INCLUDE_DIRS}) + # There is a bug in the FindGTK module in cmake version 2.8.2 that + # does not find gdk-pixbuf-2.0. On the other hand some 2.8.3 + # users have complained that pkg-config does not find + # gdk-pixbuf-2.0 + if(${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH} + VERSION_EQUAL 2.8.2) + check_lib(GTK2 gtk+-2.0 gtk.h REQUIRED) + else() + include(FindGTK2 REQUIRED) + if(GTK2_FOUND) + include_directories(${GTK2_INCLUDE_DIRS}) + endif() endif() endif() diff --git a/Languages/Languages.vcproj b/Languages/Languages.vcproj index e19c6498ae..d760997b2d 100644 --- a/Languages/Languages.vcproj +++ b/Languages/Languages.vcproj @@ -78,6 +78,10 @@ RelativePath=".\de.po" > + + @@ -98,6 +102,10 @@ RelativePath=".\it.po" > + + @@ -106,6 +114,10 @@ RelativePath=".\nb.po" > + + diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index ae22004e9c..5ae45e2b28 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -44,7 +44,7 @@ endif(WIN32) enable_precompiled_headers(Src/stdafx.h Src/stdafx.cpp SRCS) add_library(common STATIC ${SRCS}) -target_link_libraries(common ${CMAKE_DL_LIBS}) +target_link_libraries(common ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") add_definitions(-fPIC) endif()