qutecom/qutecom-2.2.1-libboost-link.patch

98 lines
2.8 KiB
Diff

--- libs/3rdparty/psiidle/psiidle/CMakeLists.txt.link 2010-02-23 23:49:25.000000000 +0100
+++ libs/3rdparty/psiidle/psiidle/CMakeLists.txt 2010-02-23 23:49:46.000000000 +0100
@@ -46,6 +46,7 @@
-DHAVE_XSS
)
ow_add_private_libraries(
+ X11
Xss
)
else (LIBXSS_LINK_FLAGS)
--- libs/3rdparty/googlebreakpad/CMakeLists-internal-unix.txt.link 2010-01-20 16:19:25.000000000 +0100
+++ libs/3rdparty/googlebreakpad/CMakeLists-internal-unix.txt 2010-08-05 16:19:24.000000000 +0200
@@ -6,6 +6,8 @@
${CMAKE_CURRENT_SOURCE_DIR}/src/client/linux/handler
)
+ow_add_private_libraries(md5)
+
ow_add_sources(
src/common/convert_UTF.c
src/common/string_conversion.cc
@@ -25,4 +27,3 @@
)
ow_create_project_binary()
-
--- owbuild/FindBoost.cmake~ 2011-02-10 18:03:43.000000000 +0800
+++ owbuild/FindBoost.cmake 2013-04-06 10:49:49.653968941 +0800
@@ -313,6 +313,15 @@
endif (NOT BOOST_DATE_TIME_LIBRARY)
+ if (NOT BOOST_SYSTEM_LIBRARY)
+ find_library(BOOST_SYSTEM_LIBRARY
+ NAMES
+ boost_system${TMP_BOOST_LIBRARIES_SUFFIX}
+ PATHS
+ ${BOOST_LIBRARIES_SEARCH_DIRS}
+ )
+ endif (NOT BOOST_SYSTEM_LIBRARY)
+
if (NOT BOOST_FILESYSTEM_LIBRARY)
find_library(BOOST_FILESYSTEM_LIBRARY
NAMES
@@ -427,6 +436,9 @@
if (BOOST_DATE_TIME_LIBRARY)
set(BOOST_DATE_TIME_FOUND TRUE)
endif (BOOST_DATE_TIME_LIBRARY)
+ if (BOOST_SYSTEM_LIBRARY)
+ set(BOOST_SYSTEM_FOUND TRUE)
+ endif (BOOST_SYSTEM_LIBRARY)
if (BOOST_FILESYSTEM_LIBRARY)
set(BOOST_FILESYSTEM_FOUND TRUE)
endif (BOOST_FILESYSTEM_LIBRARY)
@@ -548,6 +560,12 @@
${BOOST_WSERIALIZATION_LIBRARY}
)
endif (BOOST_WSERIALIZATION_FOUND)
+ if (BOOST_SYSTEM_FOUND)
+ set(BOOST_LIBRARIES
+ ${BOOST_LIBRARIES}
+ ${BOOST_SYSTEM_LIBRARY}
+ )
+ endif (BOOST_SYSTEM_FOUND)
if (BOOST_INCLUDE_DIRS AND BOOST_LIBRARIES)
set(BOOST_FOUND TRUE)
--- libs/3rdparty/boost/CMakeLists.txt~ 2011-02-10 18:03:43.000000000 +0800
+++ libs/3rdparty/boost/CMakeLists.txt 2013-04-06 11:24:56.165701506 +0800
@@ -17,6 +17,7 @@
${BOOST_SERIALIZATION_LIBRARY}
${BOOST_SIGNALS_LIBRARY}
${BOOST_THREAD_LIBRARY}
+ ${BOOST_SYSTEM_LIBRARY}
CACHE INTERNAL "${PROJECT_NAME} libraries"
)
endif (NOT MSVC)
--- libs/owutil/thread/CMakeLists.txt~ 2011-02-10 18:03:43.000000000 +0800
+++ libs/owutil/thread/CMakeLists.txt 2013-04-06 11:36:39.373273830 +0800
@@ -3,6 +3,7 @@
ow_use_public_libraries(
owutil
boost
+ pthread
)
ow_add_sources(
--- crashreport/CMakeLists.txt~ 2011-02-10 18:03:43.000000000 +0800
+++ crashreport/CMakeLists.txt 2013-04-06 12:13:20.179067519 +0800
@@ -40,6 +40,7 @@
qtmain.lib
)
endif (WIN32)
+ow_add_private_libraries(pthread)
# FIXME: This has been copied from qutecom/src/CMakeLists.txt, it would be
# nicer to avoid duplication.