|
Lines 144-149
Link Here
|
| 144 |
get_filename_component(QT_LIBRARY_PATH "${QT_BIN_DIR}/../lib" ABSOLUTE CACHE) |
144 |
get_filename_component(QT_LIBRARY_PATH "${QT_BIN_DIR}/../lib" ABSOLUTE CACHE) |
| 145 |
get_filename_component(QT_INSTALL_PATH "${QT_BIN_DIR}/.." ABSOLUTE CACHE) |
145 |
get_filename_component(QT_INSTALL_PATH "${QT_BIN_DIR}/.." ABSOLUTE CACHE) |
| 146 |
|
146 |
|
|
|
147 |
find_path(QTSINGLEAPPLIB_INCLUDE_DIR NAMES QtSingleApplication |
| 148 |
PATH_SUFFIXES QtSolutions |
| 149 |
PATHS |
| 150 |
/usr/include/qt5) |
| 151 |
find_library(QTSINGLEAPPLIB Qt5Solutions_SingleApplication-2.6 |
| 152 |
libQt5Solutions_SingleApplication-2.6) |
| 153 |
|
| 147 |
# disable clang warnings for qt sources |
154 |
# disable clang warnings for qt sources |
| 148 |
if(APPLE) |
155 |
if(APPLE) |
| 149 |
add_definitions(-Wno-unused-private-field |
156 |
add_definitions(-Wno-unused-private-field |
|
Lines 162-168
Link Here
|
| 162 |
|
169 |
|
| 163 |
set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES}) |
170 |
set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES}) |
| 164 |
list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES |
171 |
list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES |
| 165 |
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h |
|
|
| 166 |
${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp |
172 |
${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp |
| 167 |
${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp |
173 |
${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp |
| 168 |
${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp |
174 |
${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp |
|
Lines 232-239
Link Here
|
| 232 |
DesktopSynctex.cpp |
238 |
DesktopSynctex.cpp |
| 233 |
DesktopJobLauncherOverlay.cpp |
239 |
DesktopJobLauncherOverlay.cpp |
| 234 |
RemoteDesktopSessionLauncherOverlay.cpp |
240 |
RemoteDesktopSessionLauncherOverlay.cpp |
| 235 |
3rdparty/qtsingleapplication/qtsingleapplication.cpp |
|
|
| 236 |
3rdparty/qtsingleapplication/qtlocalpeer.cpp |
| 237 |
) |
241 |
) |
| 238 |
|
242 |
|
| 239 |
if(WIN32) |
243 |
if(WIN32) |
|
Lines 290-295
Link Here
|
| 290 |
${OPENSSL_INCLUDE_DIR} |
294 |
${OPENSSL_INCLUDE_DIR} |
| 291 |
${CMAKE_CURRENT_SOURCE_DIR} |
295 |
${CMAKE_CURRENT_SOURCE_DIR} |
| 292 |
${CMAKE_CURRENT_BINARY_DIR} |
296 |
${CMAKE_CURRENT_BINARY_DIR} |
|
|
297 |
${QTSINGLEAPPLIB_INCLUDE_DIR} |
| 293 |
${EXT_SOURCE_DIR} |
298 |
${EXT_SOURCE_DIR} |
| 294 |
${SESSION_SOURCE_DIR}/include |
299 |
${SESSION_SOURCE_DIR}/include |
| 295 |
${TESTS_INCLUDE_DIR} |
300 |
${TESTS_INCLUDE_DIR} |
|
Lines 404-409
Link Here
|
| 404 |
# set link dependencies |
409 |
# set link dependencies |
| 405 |
target_link_libraries(rstudio |
410 |
target_link_libraries(rstudio |
| 406 |
${RSTUDIO_QTMODULES} |
411 |
${RSTUDIO_QTMODULES} |
|
|
412 |
${QTSINGLEAPPLIB} |
| 407 |
${QT_LIBRARIES} |
413 |
${QT_LIBRARIES} |
| 408 |
${Boost_LIBRARIES} |
414 |
${Boost_LIBRARIES} |
| 409 |
rstudio-core |
415 |
rstudio-core |
