From: lvaatamoinen <lassi.vaatamoinen@ixonos.com>
Date: Sun, 29 Jan 2012 14:50:40 +0000 (+0000)
Subject: Modified CMakeLists back to build on Harmattan.
X-Git-Url: http://git.maemo.org/git/?p=qtrapids;a=commitdiff_plain;h=fb1b5e73f9767fecad734f260b1c5397709f0f70

Modified CMakeLists back to build on Harmattan.


git-svn-id: file:///svnroot/qtrapids/trunk@86 42ac0dd5-4c8c-4c71-bb3e-ecdfe252ffda
---

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index da3d8b5..de62062 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -41,7 +41,8 @@ INSTALL(TARGETS qtrapids-gui DESTINATION bin)
 
 ADD_DEFINITIONS(-DQT_SHARED)
 
-set(QT_QTMAEMO5_LIBRARY -lQtMaemo5 -L${QT_LIBRARY_DIR})
+#This does not exist in Harmattan anymore, so removed -lQtMaemo5
+#set(QT_QTMAEMO5_LIBRARY -lQtMaemo5 -L${QT_LIBRARY_DIR})
 
 # QT_QTMAEMO5_* variables are not defined by CMake
 if(NOT QT_QTMAEMO5_INCLUDE_DIR)
@@ -68,7 +69,8 @@ set (SCRATCHBOX_UNAME $ENV{SBOX_UNAME_MACHINE})
 
 if (SCRATCHBOX_UNAME)
 	MESSAGE("Configuring for building under Scratchbox..")
-	TARGET_LINK_LIBRARIES(qtrapids-gui  ${QT_QTMAEMO5_LIBRARY})
+#This does not exist in Harmattan anymore, so disabling.
+#	TARGET_LINK_LIBRARIES(qtrapids-gui  ${QT_QTMAEMO5_LIBRARY})
 endif (SCRATCHBOX_UNAME)
 
 #MESSAGE(${CMAKE_HOST_SYSTEM_PROCESSOR}) 
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 7f324ff..bac6da7 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -11,6 +11,8 @@ INCLUDE_DIRECTORIES(
    ${QT_INCLUDE_DIR}
    ${QT_QTDBUS_INCLUDE_DIR}
    ${QT_QTSQL_INCLUDE_DIR}
+   # TODO: Used temporarily for Harmattan, find or package libtorrent and use from system path
+   /usr/local/include/libtorrent
 )
 
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/server.cpp ${CMAKE_CURRENT_SOURCE_DIR}/server.h PROPERTIES GENERATED 1)