From: Enar Väikene Date: Tue, 5 Jun 2012 06:23:10 +0000 (+0300) Subject: Merge branch 'master' of ssh://vaikene.net/var/gitpub/evaf X-Git-Url: https://vaikene.ee/gitweb/highlight.css?a=commitdiff_plain;h=6fb7963d523b32158fc3d4b88a933825f8535a0b;hp=2abf509a06bab00baa0746d4911ca8b60f58e08a;p=evaf Merge branch 'master' of ssh://vaikene.net/var/gitpub/evaf --- diff --git a/src/apps/FileFinder/CMakeLists.txt b/src/apps/FileFinder/CMakeLists.txt index cea6206..74c9f28 100644 --- a/src/apps/FileFinder/CMakeLists.txt +++ b/src/apps/FileFinder/CMakeLists.txt @@ -1,2 +1,4 @@ add_subdirectory(Engine) -add_subdirectory(GUI) +if(QT_QTGUI_FOUND) + add_subdirectory(GUI) +endif(QT_QTGUI_FOUND) diff --git a/src/apps/PswGen/CMakeLists.txt b/src/apps/PswGen/CMakeLists.txt index 01770c2..3eadf22 100644 --- a/src/apps/PswGen/CMakeLists.txt +++ b/src/apps/PswGen/CMakeLists.txt @@ -1,6 +1,8 @@ set(eVaf_INCLUDE ${eVaf_INCLUDE} ${CMAKE_SOURCE_DIR}/src/apps/PswGen) -add_subdirectory(GUI) +if(QT_QTGUI_FOUND) + add_subdirectory(GUI) +endif(QT_QTGUI_FOUND) add_subdirectory(CLI) add_subdirectory(Generator) add_subdirectory(Storage) diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt index 09e2f82..eabd2bc 100644 --- a/src/libs/CMakeLists.txt +++ b/src/libs/CMakeLists.txt @@ -1,3 +1,5 @@ add_subdirectory(Plugins) add_subdirectory(Common) -add_subdirectory(Gui) +if(QT_QTGUI_FOUND) + add_subdirectory(Gui) +endif(QT_QTGUI_FOUND) diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index 362aba6..e5169f7 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -1,2 +1,4 @@ -add_subdirectory(GUI) +if(QT_QTGUI_FOUND) + add_subdirectory(GUI) +endif(QT_QTGUI_FOUND) add_subdirectory(CLI) diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 133d289..bffa796 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -1,3 +1,5 @@ -add_subdirectory(SdiWindow) -add_subdirectory(LogView) -add_subdirectory(Test) +if(QT_QTGUI_FOUND) + add_subdirectory(SdiWindow) + add_subdirectory(LogView) + add_subdirectory(Test) +endif(QT_QTGUI_FOUND)