changeset 111:36ac0697339e

Merged
author Sascha Wilde <wilde@intevation.de>
date Fri, 21 Mar 2014 15:59:46 +0100
parents 0c8ea71a89cd (current diff) 2a031ac963b0 (diff)
children 9bfa2a60b9b8
files
diffstat 1 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Fri Mar 21 15:46:12 2014 +0100
+++ b/CMakeLists.txt	Fri Mar 21 15:59:46 2014 +0100
@@ -13,6 +13,9 @@
 include(GenerateCppcheck)
 
 find_package(PolarSSL)
+include_directories(${POLARSSL_INCLUDE_DIR})
+
+find_package(Qt5Widgets)
 
 # Use cmake's automoc and make sure the generated files are included
 set(CMAKE_AUTOMOC ON)
@@ -70,7 +73,13 @@
 endif (FLAWFINDER_PATH)
 
 add_subdirectory(cinst)
-add_subdirectory(ui)
+if(Qt5Widgets_FOUND)
+    add_subdirectory(ui)
+else()
+   message(STATUS "WARNING: Could not find qt. GUI parts will not be built.")
+endif()
+
+add_subdirectory(common)
 
 # Documentation
 configure_file (doc/Doxyfile.in doc/Doxyfile)

http://wald.intevation.org/projects/trustbridge/