Mercurial > trustbridge
changeset 109:16f37460b2e1
Use m13_common library
author | Andre Heinecke <aheinecke@intevation.de> |
---|---|
date | Fri, 21 Mar 2014 16:07:35 +0000 |
parents | 39c42b5a5693 |
children | 447a7abee6c7 |
files | ui/CMakeLists.txt ui/tests/CMakeLists.txt |
diffstat | 2 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ui/CMakeLists.txt Fri Mar 21 16:05:33 2014 +0000 +++ b/ui/CMakeLists.txt Fri Mar 21 16:07:35 2014 +0000 @@ -1,5 +1,3 @@ -find_package(Qt5Widgets REQUIRED) - include_directories(${Qt5Widgets_INCLUDE_DIRS}) include_directories(${POLARSSL_INCLUDE_DIR}) add_definitions(${Qt5Widgets_DEFINITIONS}) @@ -7,7 +5,6 @@ set(CERTIFICATELIST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/certificatelist.cpp ${CMAKE_CURRENT_SOURCE_DIR}/certificate.cpp - ${CMAKE_SOURCE_DIR}/common/listutil.c ) set(DOWNLOADER_SOURCES @@ -77,6 +74,7 @@ add_executable(m13ui ${M13UI_SOURCES_WITH_RESOURCES}) target_link_libraries(m13ui Qt5::Widgets + m13_common ${POLARSSL_LIBRARIES} ${EXTRA_STATIC_LIBS} ${PROFILING_LIBS})
--- a/ui/tests/CMakeLists.txt Fri Mar 21 16:05:33 2014 +0000 +++ b/ui/tests/CMakeLists.txt Fri Mar 21 16:07:35 2014 +0000 @@ -17,6 +17,7 @@ add_executable(${_name} ${_test} ${_additional_sources}) add_test(m13-${_name} ${_name}) target_link_libraries(${_name} Qt5::Test Qt5::Widgets + m13_common ${POLARSSL_LIBRARIES} ${EXTRA_STATIC_LIBS}) endmacro()