From a2f83ddecd9e23d5f6306abde8b28e43a975cd94 Mon Sep 17 00:00:00 2001
From: Marko Saukko <marko.saukko@cybercom.com>
Date: Wed, 21 Dec 2011 10:56:06 +0200
Subject: [PATCH] Fix build with newer toolchains by adding the missing libs to
 linking.

Signed-off-by: Marko Saukko <marko.saukko@cybercom.com>
---
 tests/common/testapps/fala_qml_helloworld/CMakeLists.txt       | 2 +-
 tests/common/testapps/xsendevent/CMakeLists.txt                | 2 +-
 tests/common/unittests/ut_appdata/CMakeLists.txt               | 2 +-
 tests/common/unittests/ut_booster/CMakeLists.txt               | 2 +-
 tests/common/unittests/ut_boosterfactory/CMakeLists.txt        | 2 +-
 tests/common/unittests/ut_boosterpluginregistry/CMakeLists.txt | 2 +-
 tests/common/unittests/ut_connection/CMakeLists.txt            | 2 +-
 tests/common/unittests/ut_daemon/CMakeLists.txt                | 2 +-
 tests/common/unittests/ut_dbooster/CMakeLists.txt              | 2 +-
 tests/common/unittests/ut_ebooster/CMakeLists.txt              | 2 +-
 tests/common/unittests/ut_logger/CMakeLists.txt                | 2 +-
 tests/common/unittests/ut_mbooster/CMakeLists.txt              | 2 +-
 tests/common/unittests/ut_qtbooster/CMakeLists.txt             | 2 +-
 tests/common/unittests/ut_singleinstance/CMakeLists.txt        | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/common/testapps/fala_qml_helloworld/CMakeLists.txt b/tests/common/testapps/fala_qml_helloworld/CMakeLists.txt
index 18d1afb..cddf2e9 100644
--- a/tests/common/testapps/fala_qml_helloworld/CMakeLists.txt
+++ b/tests/common/testapps/fala_qml_helloworld/CMakeLists.txt
@@ -28,7 +28,7 @@ QT4_ADD_RESOURCES(RESOURCE_SRC main.qrc)
 # Enable Qt-support
 include(${QT_USE_FILE})
 
-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} "-L${CMAKE_SOURCE_DIR}/src/qdeclarativebooster ${booster_libs}")
+link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} "-L${CMAKE_SOURCE_DIR}/src/qdeclarativebooster ${booster_libs}")
 add_executable(fala_qml ${SRC} ${RESOURCE_SRC})
 
 # Install
diff --git a/tests/common/testapps/xsendevent/CMakeLists.txt b/tests/common/testapps/xsendevent/CMakeLists.txt
index a9e22ec..d5834dd 100644
--- a/tests/common/testapps/xsendevent/CMakeLists.txt
+++ b/tests/common/testapps/xsendevent/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Set sources
 set(SRC main.cpp)
-link_libraries(${MEEGOTOUCH_LIBRARIES})
+link_libraries(${MEEGOTOUCH_LIBRARIES} -lX11)
 
 add_executable(xsendevent ${SRC})
 
diff --git a/tests/common/unittests/ut_appdata/CMakeLists.txt b/tests/common/unittests/ut_appdata/CMakeLists.txt
index 9c83b31..a9805fd 100644
--- a/tests/common/unittests/ut_appdata/CMakeLists.txt
+++ b/tests/common/unittests/ut_appdata/CMakeLists.txt
@@ -18,7 +18,7 @@ set(QT_USE_QTTEST TRUE)
 # Set include paths
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${LAUNCHER} ${PROTOCOL})
 
-link_libraries(${QT_QTTEST_LIBRARY})
+link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} -ldl)
 
 # Enable Qt (may not be needed, because already defined on higher level)
 include(${QT_USE_FILE})
diff --git a/tests/common/unittests/ut_booster/CMakeLists.txt b/tests/common/unittests/ut_booster/CMakeLists.txt
index e204927..176b565 100644
--- a/tests/common/unittests/ut_booster/CMakeLists.txt
+++ b/tests/common/unittests/ut_booster/CMakeLists.txt
@@ -16,7 +16,7 @@ set(QT_USE_QTTEST TRUE)
 # Set include paths
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common ${LAUNCHER})
 
-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBCREDS} ${X11_LIBRARIES})
+link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBCREDS} ${X11_LIBRARIES} -ldl)
 
 # Enable Qt (may not be needed, because already defined on higher level)
 include(${QT_USE_FILE})
diff --git a/tests/common/unittests/ut_boosterfactory/CMakeLists.txt b/tests/common/unittests/ut_boosterfactory/CMakeLists.txt
index a859098..5b63056 100644
--- a/tests/common/unittests/ut_boosterfactory/CMakeLists.txt
+++ b/tests/common/unittests/ut_boosterfactory/CMakeLists.txt
@@ -18,7 +18,7 @@ set(QT_USE_QTTEST TRUE)
 # Set include paths
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common ${LAUNCHER})
 
-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${LIBCREDS} ${X11_LIBRARIES})
+link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${LIBCREDS} ${X11_LIBRARIES} -ldl)
 
 # Enable Qt (may not be needed, because already defined on higher level)
 include(${QT_USE_FILE})
diff --git a/tests/common/unittests/ut_boosterpluginregistry/CMakeLists.txt b/tests/common/unittests/ut_boosterpluginregistry/CMakeLists.txt
index aaf0c8d..77606fc 100644
--- a/tests/common/unittests/ut_boosterpluginregistry/CMakeLists.txt
+++ b/tests/common/unittests/ut_boosterpluginregistry/CMakeLists.txt
@@ -21,7 +21,7 @@ set(QT_USE_QTTEST TRUE)
 # Set include paths
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${LAUNCHER})
 
-link_libraries(${QT_QTTEST_LIBRARY})
+link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} -ldl)
 
 # Enable Qt (may not be needed, because already defined on higher level)
 include(${QT_USE_FILE})
diff --git a/tests/common/unittests/ut_connection/CMakeLists.txt b/tests/common/unittests/ut_connection/CMakeLists.txt
index 20f9b9b..463dc98 100644
--- a/tests/common/unittests/ut_connection/CMakeLists.txt
+++ b/tests/common/unittests/ut_connection/CMakeLists.txt
@@ -20,7 +20,7 @@ set(QT_USE_QTTEST TRUE)
 
 # Set include paths
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common ${LAUNCHER})
-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${X11_LIBRARIES})
+link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${X11_LIBRARIES} -ldl)
 
 # Enable Qt (may not be needed, because already defined on higher level)
 include(${QT_USE_FILE})
diff --git a/tests/common/unittests/ut_daemon/CMakeLists.txt b/tests/common/unittests/ut_daemon/CMakeLists.txt
index d5838c6..e4382fd 100644
--- a/tests/common/unittests/ut_daemon/CMakeLists.txt
+++ b/tests/common/unittests/ut_daemon/CMakeLists.txt
@@ -20,7 +20,7 @@ set(QT_USE_QTTEST TRUE)
 
 # Set include paths
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common ${LAUNCHER})
-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${X11_LIBRARIES})
+link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${X11_LIBRARIES} -ldl)
 
 # Enable Qt (may not be needed, because already defined on higher level)
 include(${QT_USE_FILE})
diff --git a/tests/common/unittests/ut_dbooster/CMakeLists.txt b/tests/common/unittests/ut_dbooster/CMakeLists.txt
index c6d8548..eb14bd5 100644
--- a/tests/common/unittests/ut_dbooster/CMakeLists.txt
+++ b/tests/common/unittests/ut_dbooster/CMakeLists.txt
@@ -20,7 +20,7 @@ set(QT_USE_QTTEST TRUE)
 # Set include paths
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common ${LAUNCHER} ${DBOOSTER})
 
-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${LIBCREDS} "-L${CMAKE_SOURCE_DIR}/src/qdeclarativebooster -lmdeclarativecache")
+link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${LIBCREDS} "-L${CMAKE_SOURCE_DIR}/src/qdeclarativebooster -lmdeclarativecache" -ldl -lX11)
 
 # Enable Qt (may not be needed, because already defined on higher level)
 include(${QT_USE_FILE})
diff --git a/tests/common/unittests/ut_ebooster/CMakeLists.txt b/tests/common/unittests/ut_ebooster/CMakeLists.txt
index 75d335a..56db085 100644
--- a/tests/common/unittests/ut_ebooster/CMakeLists.txt
+++ b/tests/common/unittests/ut_ebooster/CMakeLists.txt
@@ -20,7 +20,7 @@ set(QT_USE_QTTEST TRUE)
 # Set include paths
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common ${LAUNCHER} ${EBOOSTER})
 
-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${LIBCREDS} ${X11_LIBRARIES})
+link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${LIBCREDS} ${X11_LIBRARIES} -ldl)
 
 # Enable Qt (may not be needed, because already defined on higher level)
 include(${QT_USE_FILE})
diff --git a/tests/common/unittests/ut_logger/CMakeLists.txt b/tests/common/unittests/ut_logger/CMakeLists.txt
index 3d27f22..e02cf5d 100644
--- a/tests/common/unittests/ut_logger/CMakeLists.txt
+++ b/tests/common/unittests/ut_logger/CMakeLists.txt
@@ -17,7 +17,7 @@ set(QT_USE_QTTEST TRUE)
 # Set include paths
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${LAUNCHER} ${COMMON})
 
-link_libraries(${QT_QTTEST_LIBRARY})
+link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} -ldl)
 
 # Enable Qt (may not be needed, because already defined on higher level)
 include(${QT_USE_FILE})
diff --git a/tests/common/unittests/ut_mbooster/CMakeLists.txt b/tests/common/unittests/ut_mbooster/CMakeLists.txt
index 9592726..8e82bc9 100644
--- a/tests/common/unittests/ut_mbooster/CMakeLists.txt
+++ b/tests/common/unittests/ut_mbooster/CMakeLists.txt
@@ -21,7 +21,7 @@ set(QT_USE_QTTEST TRUE)
 # Set include paths
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common ${LAUNCHER} ${MBOOSTER})
 
-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${LIBCREDS})
+link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${LIBCREDS} -ldl -lX11)
 
 # Enable Qt (may not be needed, because already defined on higher level)
 include(${QT_USE_FILE})
diff --git a/tests/common/unittests/ut_qtbooster/CMakeLists.txt b/tests/common/unittests/ut_qtbooster/CMakeLists.txt
index 56540b3..c17af5b 100644
--- a/tests/common/unittests/ut_qtbooster/CMakeLists.txt
+++ b/tests/common/unittests/ut_qtbooster/CMakeLists.txt
@@ -17,7 +17,7 @@ set(QT_USE_QTTEST TRUE)
 
 # Set include paths
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common ${LAUNCHER} ${QTBOOSTER})
-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBCREDS} ${X11_LIBRARIES})
+link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBCREDS} ${X11_LIBRARIES} -ldl)
 
 # Enable Qt (may not be needed, because already defined on higher level)
 include(${QT_USE_FILE})
diff --git a/tests/common/unittests/ut_singleinstance/CMakeLists.txt b/tests/common/unittests/ut_singleinstance/CMakeLists.txt
index 484cc3f..d262612 100644
--- a/tests/common/unittests/ut_singleinstance/CMakeLists.txt
+++ b/tests/common/unittests/ut_singleinstance/CMakeLists.txt
@@ -19,7 +19,7 @@ set(QT_USE_QTTEST TRUE)
 # Set include paths
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${LAUNCHER})
 
-link_libraries(${QT_QTTEST_LIBRARY})
+link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} -ldl)
 
 # Enable Qt (may not be needed, because already defined on higher level)
 include(${QT_USE_FILE})