This commit is contained in:
Nissim Hadar 2017-11-13 10:25:31 -08:00
parent 572646b8c6
commit aa4320104b
7 changed files with 26 additions and 29 deletions

View file

@ -4,31 +4,28 @@ project(${TARGET_NAME})
setup_hifi_project(Widgets)
link_hifi_libraries()
set ( SOURCES
src/main.cpp
src/Test.cpp
src/ui/AutoTester.cpp
src/ui/MismatchWindow.cpp
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set_property(TARGET auto-tester PROPERTY WIN32_EXECUTABLE true)
set(SOURCES src/main.cpp src/Test.cpp src/ui/AutoTester.cpp src/ui/MismatchWindow.cpp)
set(MOC_HEADERS src/ui/AutoTester.h src/ui/MismatchWindow.h)
set(UIS ui/AutoTester.ui ui/MismatchWindow.ui)
set(RESOURCES src/AutoTester.qrc)
QT5_ADD_RESOURCES(RES_SOURCES ${RESOURCES})
QT5_WRAP_UI(UI_HEADERS ${UIS})
QT5_WRAP_CPP(MOC_SRCS ${MOC_HEADERS})
add_executable(PROJECT_NAME ${SOURCES} ${MOC_SRCS} ${RES_SOURCES} ${UI_HEADERS})
target_link_libraries(PROJECT_NAME ${QT_LIBRARIES})
add_custom_command(
TARGET auto-tester
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:Qt5::Core> $<TARGET_FILE_DIR:auto-tester>
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:Qt5::Gui> $<TARGET_FILE_DIR:auto-tester>
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:Qt5::Widgets> $<TARGET_FILE_DIR:auto-tester>
)
set ( MOC_HEADERS
src/ui/AutoTester.h
src/ui/MismatchWindow.h
)
set ( UIS
ui/AutoTester.ui
ui/MismatchWindow.ui
)
set ( RESOURCES
src/AutoTester.qrc
)
QT5_ADD_RESOURCES( RES_SOURCES ${RESOURCES} )
QT5_WRAP_UI( UI_HEADERS ${UIS} )
QT5_WRAP_CPP( MOC_SRCS ${MOC_HEADERS} )
add_executable( PROJECT_NAME ${SOURCES} ${MOC_SRCS} ${RES_SOURCES} ${UI_HEADERS} )
target_link_libraries( PROJECT_NAME ${QT_LIBRARIES} )

View file

@ -1,4 +1,4 @@
<RCC>
<qresource prefix="autoTester">
<qresource prefix="AutoTester">
</qresource>
</RCC>

View file

@ -72,7 +72,7 @@ void Test::evaluateTests() {
bool success{ true };
bool keepOn{ true };
for (int i = 0; keepOn && i < expectedImages.length(); ++i) {
QString diffFilename = "hifi_autoTest_diff.txt";
QString diffFilename = "HIFI_AutoTest_diff.txt";
QString command = "magick.exe compare -metric MAE " + expectedImages[i] + " " + resultImages[i] + " null: 2>" + diffFilename;
system(command.toStdString().c_str());

View file

@ -8,7 +8,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include <QtWidgets/QApplication>
#include "ui/autoTester.h"
#include "ui/AutoTester.h"
int main(int argc, char *argv[])
{

View file

@ -1,5 +1,5 @@
//
// autoTester.cpp
// AutoTester.cpp
// zone/ambientLightInheritence
//
// Created by Nissim Hadar on 2 Nov 2017.

View file

@ -12,7 +12,7 @@
#define hifi_AutoTester_h
#include <QtWidgets/QMainWindow>
#include "ui_autoTester.h"
#include "ui_AutoTester.h"
#include "../Test.h"
class AutoTester : public QMainWindow

View file

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>autoTester</string>
<string>AutoTester</string>
</property>
<widget class="QWidget" name="centralWidget">
<widget class="QPushButton" name="closeButton">
@ -76,7 +76,7 @@
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources>
<include location="autoTester.qrc"/>
<include location="../src/AutoTester.qrc"/>
</resources>
<connections/>
</ui>