projects
/
qtrapids
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modified CMakeLists back to build on Harmattan.
[qtrapids]
/
src
/
client
/
CMakeLists.txt
diff --git
a/src/client/CMakeLists.txt
b/src/client/CMakeLists.txt
index
38cc9c0
..
de62062
100644
(file)
--- a/
src/client/CMakeLists.txt
+++ b/
src/client/CMakeLists.txt
@@
-36,11
+36,13
@@
SET(SRC
)
QT4_WRAP_CPP(SRC ${MOC_HEADERS})
)
QT4_WRAP_CPP(SRC ${MOC_HEADERS})
-ADD_EXECUTABLE(qtrapids ${SRC} ${MOC_HEADERS})
+ADD_EXECUTABLE(qtrapids-gui ${SRC} ${MOC_HEADERS})
+INSTALL(TARGETS qtrapids-gui DESTINATION bin)
ADD_DEFINITIONS(-DQT_SHARED)
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)
# QT_QTMAEMO5_* variables are not defined by CMake
if(NOT QT_QTMAEMO5_INCLUDE_DIR)
@@
-53,7
+55,7
@@
if(NOT QT_QTMAEMO5_LIBRARY)
endif(NOT QT_QTMAEMO5_LIBRARY)
endif(NOT QT_QTMAEMO5_LIBRARY)
-TARGET_LINK_LIBRARIES(qtrapids
+TARGET_LINK_LIBRARIES(qtrapids-gui
${QT_QTGUI_LIBRARY}
${QT_QTCORE_LIBRARY}
${QT_QTDBUS_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTCORE_LIBRARY}
${QT_QTDBUS_LIBRARY}
@@
-67,7
+69,8
@@
set (SCRATCHBOX_UNAME $ENV{SBOX_UNAME_MACHINE})
if (SCRATCHBOX_UNAME)
MESSAGE("Configuring for building under Scratchbox..")
if (SCRATCHBOX_UNAME)
MESSAGE("Configuring for building under Scratchbox..")
- TARGET_LINK_LIBRARIES(qtrapids ${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})
endif (SCRATCHBOX_UNAME)
#MESSAGE(${CMAKE_HOST_SYSTEM_PROCESSOR})
@@
-75,4
+78,4
@@
endif (SCRATCHBOX_UNAME)
-ADD_DEPENDENCIES(qtrapids dbusapi)
+ADD_DEPENDENCIES(qtrapids-gui dbusapi)