diff options
| author | Simon Rettberg | 2014-04-14 16:33:10 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-04-14 16:33:10 +0200 |
| commit | 744d5901e3be3dd159008ed7eaa9ba83c242d2ec (patch) | |
| tree | 2c03effe226fa2f4b49e83c8cff57b4838339c53 /CMakeLists.txt | |
| parent | [SERVER] Use remove instead of unlink for better compatibility (diff) | |
| download | pvs2-744d5901e3be3dd159008ed7eaa9ba83c242d2ec.tar.gz pvs2-744d5901e3be3dd159008ed7eaa9ba83c242d2ec.tar.xz pvs2-744d5901e3be3dd159008ed7eaa9ba83c242d2ec.zip | |
Fix inclusion of X11 lib for pvsclient
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 07fe109..c68b274 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,16 +17,16 @@ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) # this command finds libraries and sets all required variables FIND_PACKAGE(Qt4 4.7.0 REQUIRED) -#FIND_PACKAGE(X11 REQUIRED) +FIND_PACKAGE(X11 REQUIRED) FIND_PACKAGE(VNC REQUIRED) # some includes INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} - ${X11_INCLUDE_DIR} -# ${X11_XTest_INCLUDE_PATH} -# ${X11_Xinput_INCLUDE_PATH} + ${CMAKE_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${X11_INCLUDE_DIR} +# ${X11_XTest_INCLUDE_PATH} +# ${X11_Xinput_INCLUDE_PATH} ) #IF(NOT X11_XTest_FOUND) @@ -138,7 +138,7 @@ QT4_CREATE_TRANSLATION(PVSCLIENT_QMS ${PVSCLIENT_SRCS} ${PVSCLIENT_UI_HDRS} ${PV # Build ################################################################################ -ADD_EXECUTABLE(pvsmgr +ADD_EXECUTABLE(pvsmgr ${PVSMGR_SRCS} ${PVSMGR_MOC_SRCS} ${PVSMGR_UI_HDRS} @@ -164,6 +164,7 @@ TARGET_LINK_LIBRARIES(pvsmgr TARGET_LINK_LIBRARIES(pvsclient ${QT_LIBRARIES} ${VNC_LIBRARIES} + ${X11_LIBRARIES} ) SET_PROPERTY(TARGET pvsmgr PROPERTY COMPILE_DEFINITIONS MAINWINDOW_USE_NORMALGUI) |