Skip to content

Commit 49cf579

Browse files
author
doesnm
committed
fix cmake, fix include
1 parent d3098cb commit 49cf579

9 files changed

Lines changed: 16 additions & 4 deletions

File tree

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@
3636

3737
project/.vs/
3838
.vs/
39-
project\project\x64\Debug
39+
project\project\x64\Debug
40+
build/

CMakeLists.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,18 @@ set(CMAKE_AUTORCC ON)
66
find_package(OpenXLSX REQUIRED)
77
find_package(Qt6 REQUIRED COMPONENTS Widgets Sql)
88
qt_standard_project_setup()
9-
qt_add_executable(${PROJECT_NAME} main.cpp mainwindow.cpp mainwindow.ui include/mainwindow.h dialog.ui dialog.cpp include/dialog.h exportexcel.ui exportexcel.cpp include/exportexcel.h)
9+
qt_add_executable(${PROJECT_NAME}
10+
src/main.cpp
11+
src/mainwindow.cpp
12+
src/dialog.cpp
13+
src/exportexcel.cpp
14+
include/mainwindow.h
15+
include/dialog.h
16+
include/exportexcel.h
17+
ui/mainwindow.ui
18+
ui/dialog.ui
19+
ui/exportexcel.ui
20+
)
1021
target_include_directories(${PROJECT_NAME} PRIVATE include)
1122
target_link_libraries(${PROJECT_NAME} PRIVATE OpenXLSX::OpenXLSX)
1223
target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Widgets)
File renamed without changes.

exportexcel.cpp renamed to src/exportexcel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "exportexcel.h"
22
#include "ui_exportexcel.h"
3-
#include "OpenXLSX.hpp"
3+
#include "OpenXLSX/OpenXLSX.hpp"
44
#include <QFileDialog>
55
#include <QSqlQuery>
66
#include <QMessageBox>
File renamed without changes.

mainwindow.cpp renamed to src/mainwindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <QRadioButton>
1515
#include <QCheckBox>
1616
#include <QDate>
17-
#include "OpenXLSX.hpp"
17+
#include "OpenXLSX/OpenXLSX.hpp"
1818
#include <QMessageBox>
1919
#include <QProcessEnvironment>
2020
#include <QFileDialog>
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)