Mercurial > trustbridge
comparison ui/CMakeLists.txt @ 978:d92b1594e974
Merged.
| author | Emanuel Schuetze <emanuel@intevation.de> |
|---|---|
| date | Fri, 29 Aug 2014 13:10:11 +0200 |
| parents | 0f7aeb12e5e9 |
| children | 2949f1842955 |
comparison
equal
deleted
inserted
replaced
| 977:9ad1f18799fb | 978:d92b1594e974 |
|---|---|
| 26 ${CMAKE_CURRENT_SOURCE_DIR}/sslhelp.cpp | 26 ${CMAKE_CURRENT_SOURCE_DIR}/sslhelp.cpp |
| 27 ) | 27 ) |
| 28 | 28 |
| 29 if (${CURL_FOUND} AND ${USE_CURL}) | 29 if (${CURL_FOUND} AND ${USE_CURL}) |
| 30 set(UICOMMON_SOURCES ${UICOMMON_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/sslconnection_curl.cpp) | 30 set(UICOMMON_SOURCES ${UICOMMON_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/sslconnection_curl.cpp) |
| 31 add_definitions(-DUSE_CURL) | 31 add_definitions(-DUSE_CURL -DCURL_STATICLIB) |
| 32 elseif (${USE_CURL}) | 32 elseif (${USE_CURL}) |
| 33 MESSAGE(FATAL_ERROR "libcurl not found but usage of curl is requested.") | 33 MESSAGE(FATAL_ERROR "libcurl not found but usage of curl is requested.") |
| 34 endif() | 34 endif() |
| 35 | 35 |
| 36 # Cmake does not correctly identify gcc windres when cross compiling | 36 # Cmake does not correctly identify gcc windres when cross compiling |
| 50 ${CMAKE_CURRENT_SOURCE_DIR}/processhelp_linux.cpp | 50 ${CMAKE_CURRENT_SOURCE_DIR}/processhelp_linux.cpp |
| 51 ${CMAKE_CURRENT_SOURCE_DIR}/processwaitdialog.cpp | 51 ${CMAKE_CURRENT_SOURCE_DIR}/processwaitdialog.cpp |
| 52 ${CMAKE_CURRENT_SOURCE_DIR}/textoverlaybutton.cpp | 52 ${CMAKE_CURRENT_SOURCE_DIR}/textoverlaybutton.cpp |
| 53 ${CMAKE_CURRENT_SOURCE_DIR}/taskscheduler.cpp | 53 ${CMAKE_CURRENT_SOURCE_DIR}/taskscheduler.cpp |
| 54 ${CMAKE_CURRENT_SOURCE_DIR}/trayicon.cpp | 54 ${CMAKE_CURRENT_SOURCE_DIR}/trayicon.cpp |
| 55 ${CMAKE_CURRENT_SOURCE_DIR}/proxysettingsdlg.cpp | |
| 55 ${CERTIFICATELIST_SOURCES} | 56 ${CERTIFICATELIST_SOURCES} |
| 56 ${DOWNLOADER_SOURCES} | 57 ${DOWNLOADER_SOURCES} |
| 57 ) | 58 ) |
| 58 | 59 |
| 59 set(ADMINISTRATOR_SOURCES | 60 set(ADMINISTRATOR_SOURCES |
| 99 elseif(WIN32) | 100 elseif(WIN32) |
| 100 get_target_property(_loc Qt5::Widgets LOCATION) | 101 get_target_property(_loc Qt5::Widgets LOCATION) |
| 101 get_filename_component(_qtpath ${_loc} PATH) | 102 get_filename_component(_qtpath ${_loc} PATH) |
| 102 set(WINDOWS_EXTRA_LIBS | 103 set(WINDOWS_EXTRA_LIBS |
| 103 -L${_qtpath} | 104 -L${_qtpath} |
| 104 -lwinspool -lshlwapi -lfreetype -lbz2 -lpng16 | 105 -lwinspool -lshlwapi |
| 105 -lQt5PlatformSupport -lQt5Gui -lcomdlg32 -loleaut32 -limm32 -lwinmm | 106 -lQt5PlatformSupport -lQt5Gui -lcomdlg32 -loleaut32 -limm32 -lwinmm |
| 106 -lglu32 -lopengl32 -lgdi32 -ljpeg -lpng -lQt5Core -lole32 -lmstask -luuid -lws2_32 | 107 -lglu32 -lopengl32 -lgdi32 -lQt5Core -lole32 -lmstask -luuid -lws2_32 |
| 107 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lsicuin -lsicuuc -lsicudt -lpcre16) | 108 -ladvapi32 -lshell32 -luser32 -lkernel32 -lpcre16) |
| 108 | 109 |
| 109 set(EXTRA_STATIC_LIBS Qt5::QWindowsIntegrationPlugin ${WINDOWS_EXTRA_LIBS} -lwinhttp -lcrypt32) | 110 set(EXTRA_STATIC_LIBS Qt5::QWindowsIntegrationPlugin ${WINDOWS_EXTRA_LIBS} -lwinhttp -lcrypt32) |
| 110 | 111 |
| 111 add_definitions(-DUNICODE) | 112 add_definitions(-DUNICODE) |
| 112 endif() | 113 endif() |
| 203 tblib | 204 tblib |
| 204 Qt5::Widgets | 205 Qt5::Widgets |
| 205 ui_common | 206 ui_common |
| 206 trustbridge_common | 207 trustbridge_common |
| 207 ${CURL_LIBRARIES} | 208 ${CURL_LIBRARIES} |
| 208 z | |
| 209 ${POLARSSL_LIBRARIES} | 209 ${POLARSSL_LIBRARIES} |
| 210 ${EXTRA_STATIC_LIBS} | 210 ${EXTRA_STATIC_LIBS} |
| 211 ${PROFILING_LIBS}) | 211 ${PROFILING_LIBS}) |
| 212 | 212 |
| 213 # Tests | 213 # Tests |