From 9fa174f8f930ef7b5191c7ade42574f469aae8e0 Mon Sep 17 00:00:00 2001 From: Samir Aguiar Date: Sun, 15 Feb 2015 01:10:06 +0100 Subject: [PATCH] unittests: Add PreferencesDialog files The sqlitetablemodel will need to access the color setting for null fields. This breaks the tests if the PreferencesDialog files are not linked to the test executable. --- tests/CMakeLists.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 75009dc7..c89d2510 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -35,6 +35,7 @@ set(SQLB_SRC ../src/csvparser.cpp ../src/grammar/Sqlite3Lexer.cpp ../src/grammar/Sqlite3Parser.cpp + ../src/PreferencesDialog.cpp ../src/tests/TestImport.cpp ../src/tests/testsqlobjects.cpp ../src/tests/TestMain.cpp) @@ -46,19 +47,27 @@ set(SQLB_HDR ../src/csvparser.h ../src/sqlitetypes.h) +set(SQLB_FORMS + ../src/PreferencesDialog.ui) + set(SQLB_MOC_HDR ../src/sqlitedb.h ../src/sqlitetablemodel.h + ../src/PreferencesDialog.h ../src/tests/TestImport.h ../src/tests/testsqlobjects.h) -if(NOT USE_QT5) +if(USE_QT5) + QT5_WRAP_CPP(SQLB_MOC ${SQLB_MOC_HDR}) + QT5_WRAP_UI(SQLB_FORM_HDR ${SQLB_FORMS}) +else() QT4_WRAP_CPP(SQLB_MOC ${SQLB_MOC_HDR}) + QT4_WRAP_UI(SQLB_FORM_HDR ${SQLB_FORMS}) endif() -include_directories("${ANTLR_DIR}" ../src) +include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${ANTLR_DIR}" ../src) -add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC}) +add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC} ${SQLB_FORM_HDR}) if(USE_QT5) qt5_use_modules(${PROJECT_NAME} Test Widgets Gui)