Skip to content

Commit c8ca4f5

Browse files
j2dollj2doll
authored
Merge pull request #140 from QtExcel/qt6beta
Qt6beta
2 parents 5e81f85 + 8eeaf17 commit c8ca4f5

File tree

10 files changed

+407
-79
lines changed

10 files changed

+407
-79
lines changed

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,3 +397,9 @@ ASALocalRun/
397397
/cmake_install.cmake
398398
/CMakeFiles/
399399
/Makefile
400+
401+
/QXlsx/CMakeCache.txt
402+
/QXlsx/cmake_install.cmake
403+
/QXlsx/CMakeFiles/
404+
/QXlsx/Makefile
405+

‎CMakeLists.txt

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎DateTime/CMakeLists.txt

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# CMakeLists.txt for Console Application
2+
3+
# TODO: Set minumum cmake version
4+
cmake_minimum_required(VERSION 3.14)
5+
6+
# TODO: Set project name
7+
project(DateTime LANGUAGES CXX)
8+
9+
# TODO: Set Your C++ version
10+
set(CMAKE_CXX_STANDARD 11) # C++ 11
11+
12+
##########################
13+
# bolier-plate code (1) {{
14+
15+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
16+
17+
set(CMAKE_AUTOUIC ON)
18+
set(CMAKE_AUTOMOC ON)
19+
set(CMAKE_AUTORCC ON)
20+
21+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
22+
23+
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Gui REQUIRED)
24+
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui REQUIRED)
25+
26+
if(NOT DEFINED ${QXLSX_PARENTPATH})
27+
set(QXLSX_PARENTPATH ${CMAKE_CURRENT_SOURCE_DIR}/../)
28+
endif(NOT DEFINED ${QXLSX_PARENTPATH})
29+
30+
if(NOT DEFINED ${QXLSX_HEADERPATH})
31+
set(QXLSX_HEADERPATH ${CMAKE_CURRENT_SOURCE_DIR}/../QXlsx/header/)
32+
endif(NOT DEFINED ${QXLSX_HEADERPATH})
33+
34+
if(NOT DEFINED ${QXLSX_SOURCEPATH})
35+
set(QXLSX_SOURCEPATH ${CMAKE_CURRENT_SOURCE_DIR}/../QXlsx/source/)
36+
endif(NOT DEFINED ${QXLSX_SOURCEPATH})
37+
38+
message("Current Path of QXlsx")
39+
message(${QXLSX_PARENTPATH})
40+
message(${QXLSX_HEADERPATH})
41+
message(${QXLSX_SOURCEPATH})
42+
43+
include_directories(${QXLSX_HEADERPATH})
44+
45+
file(GLOB QXLSX_CPP "${QXLSX_SOURCEPATH}/*.cpp")
46+
file(GLOB QXLSX_H "${QXLSX_HEADERPATH}/*.h")
47+
48+
set(SRC_FILES ${QXLSX_CPP})
49+
list(APPEND SRC_FILES ${QXLSX_H})
50+
51+
# bolier-plate code (1) }}
52+
###########################
53+
54+
#########################
55+
# Console Application {{
56+
57+
# TODO: set your source code
58+
set(APP_SRC_FILES
59+
main.cpp
60+
test.cpp )
61+
62+
list(APPEND SRC_FILES ${APP_SRC_FILES})
63+
add_executable(${PROJECT_NAME} ${SRC_FILES})
64+
65+
# Console Application }}
66+
########################
67+
68+
##########################
69+
# bolier-plate code (2) {{
70+
71+
target_include_directories(${PROJECT_NAME} PRIVATE
72+
${QXLSX_HEADERPATH}
73+
${CMAKE_CURRENT_SOURCE_DIR} )
74+
75+
target_link_libraries(${PROJECT_NAME}
76+
Qt${QT_VERSION_MAJOR}::Core
77+
Qt${QT_VERSION_MAJOR}::GuiPrivate
78+
)
79+
80+
set(CMAKE_WIN32_EXECUTABLE OFF)
81+
82+
# bolier-plate code (2) }}
83+
##########################
84+

‎HelloWorld/CMakeLists.txt

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# CMakeLists.txt for Console Application
2+
3+
# TODO: Set minumum cmake version
4+
cmake_minimum_required(VERSION 3.14)
5+
6+
# TODO: Set project name
7+
project(HelloWorld LANGUAGES CXX)
8+
9+
# TODO: Set Your C++ version
10+
set(CMAKE_CXX_STANDARD 11) # C++ 11
11+
12+
##########################
13+
# bolier-plate code (1) {{
14+
15+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
16+
17+
set(CMAKE_AUTOUIC ON)
18+
set(CMAKE_AUTOMOC ON)
19+
set(CMAKE_AUTORCC ON)
20+
21+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
22+
23+
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Gui REQUIRED)
24+
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui REQUIRED)
25+
26+
if(NOT DEFINED ${QXLSX_PARENTPATH})
27+
set(QXLSX_PARENTPATH ${CMAKE_CURRENT_SOURCE_DIR}/../)
28+
endif(NOT DEFINED ${QXLSX_PARENTPATH})
29+
30+
if(NOT DEFINED ${QXLSX_HEADERPATH})
31+
set(QXLSX_HEADERPATH ${CMAKE_CURRENT_SOURCE_DIR}/../QXlsx/header/)
32+
endif(NOT DEFINED ${QXLSX_HEADERPATH})
33+
34+
if(NOT DEFINED ${QXLSX_SOURCEPATH})
35+
set(QXLSX_SOURCEPATH ${CMAKE_CURRENT_SOURCE_DIR}/../QXlsx/source/)
36+
endif(NOT DEFINED ${QXLSX_SOURCEPATH})
37+
38+
message("Current Path of QXlsx")
39+
message(${QXLSX_PARENTPATH})
40+
message(${QXLSX_HEADERPATH})
41+
message(${QXLSX_SOURCEPATH})
42+
43+
include_directories(${QXLSX_HEADERPATH})
44+
45+
file(GLOB QXLSX_CPP "${QXLSX_SOURCEPATH}/*.cpp")
46+
file(GLOB QXLSX_H "${QXLSX_HEADERPATH}/*.h")
47+
48+
set(SRC_FILES ${QXLSX_CPP})
49+
list(APPEND SRC_FILES ${QXLSX_H})
50+
51+
# bolier-plate code (1) }}
52+
###########################
53+
54+
#########################
55+
# Console Application {{
56+
57+
# TODO: set your source code
58+
set(APP_SRC_FILES
59+
main.cpp)
60+
61+
list(APPEND SRC_FILES ${APP_SRC_FILES})
62+
add_executable(${PROJECT_NAME} ${SRC_FILES})
63+
64+
# Console Application }}
65+
########################
66+
67+
##########################
68+
# bolier-plate code (2) {{
69+
70+
target_include_directories(${PROJECT_NAME} PRIVATE
71+
${QXLSX_HEADERPATH}
72+
${CMAKE_CURRENT_SOURCE_DIR} )
73+
74+
target_link_libraries(${PROJECT_NAME}
75+
Qt${QT_VERSION_MAJOR}::Core
76+
Qt${QT_VERSION_MAJOR}::GuiPrivate
77+
)
78+
79+
set(CMAKE_WIN32_EXECUTABLE OFF)
80+
81+
# bolier-plate code (2) }}
82+
##########################
83+

‎Pump/CMakeLists.txt

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
# CMakeLists.txt for Console Application
2+
3+
# TODO: Set minumum cmake version
4+
cmake_minimum_required(VERSION 3.14)
5+
6+
# TODO: Set project name
7+
project(Pump LANGUAGES CXX)
8+
9+
# TODO: Set Your C++ version
10+
set(CMAKE_CXX_STANDARD 11) # C++ 11
11+
12+
##########################
13+
# bolier-plate code (1) {{
14+
15+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
16+
17+
set(CMAKE_AUTOUIC ON)
18+
set(CMAKE_AUTOMOC ON)
19+
set(CMAKE_AUTORCC ON)
20+
21+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
22+
23+
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Gui REQUIRED)
24+
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui REQUIRED)
25+
26+
if(NOT DEFINED ${QXLSX_PARENTPATH})
27+
set(QXLSX_PARENTPATH ${CMAKE_CURRENT_SOURCE_DIR}/../)
28+
endif(NOT DEFINED ${QXLSX_PARENTPATH})
29+
30+
if(NOT DEFINED ${QXLSX_HEADERPATH})
31+
set(QXLSX_HEADERPATH ${CMAKE_CURRENT_SOURCE_DIR}/../QXlsx/header/)
32+
endif(NOT DEFINED ${QXLSX_HEADERPATH})
33+
34+
if(NOT DEFINED ${QXLSX_SOURCEPATH})
35+
set(QXLSX_SOURCEPATH ${CMAKE_CURRENT_SOURCE_DIR}/../QXlsx/source/)
36+
endif(NOT DEFINED ${QXLSX_SOURCEPATH})
37+
38+
message("Current Path of QXlsx")
39+
message(${QXLSX_PARENTPATH})
40+
message(${QXLSX_HEADERPATH})
41+
message(${QXLSX_SOURCEPATH})
42+
43+
include_directories(${QXLSX_HEADERPATH})
44+
45+
file(GLOB QXLSX_CPP "${QXLSX_SOURCEPATH}/*.cpp")
46+
file(GLOB QXLSX_H "${QXLSX_HEADERPATH}/*.h")
47+
48+
set(SRC_FILES ${QXLSX_CPP})
49+
list(APPEND SRC_FILES ${QXLSX_H})
50+
51+
# bolier-plate code (1) }}
52+
###########################
53+
54+
#########################
55+
# Console Application {{
56+
57+
# TODO: set your source code
58+
set(APP_SRC_FILES
59+
main.cpp
60+
test.cpp
61+
pump.qrc
62+
)
63+
64+
list(APPEND SRC_FILES ${APP_SRC_FILES})
65+
add_executable(${PROJECT_NAME} ${SRC_FILES})
66+
67+
# Console Application }}
68+
########################
69+
70+
##########################
71+
# bolier-plate code (2) {{
72+
73+
target_include_directories(${PROJECT_NAME} PRIVATE
74+
${QXLSX_HEADERPATH}
75+
${CMAKE_CURRENT_SOURCE_DIR} )
76+
77+
target_link_libraries(${PROJECT_NAME}
78+
Qt${QT_VERSION_MAJOR}::Core
79+
Qt${QT_VERSION_MAJOR}::GuiPrivate
80+
)
81+
82+
set(CMAKE_WIN32_EXECUTABLE OFF)
83+
84+
# bolier-plate code (2) }}
85+
##########################
86+

‎QXlsx/CMakeLists.txt

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# CMakeLists.txt for QXlsx Library
2+
3+
cmake_minimum_required(VERSION 3.14)
4+
5+
project(QXlsx LANGUAGES CXX)
6+
7+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
8+
9+
set(CMAKE_AUTOUIC ON)
10+
set(CMAKE_AUTOMOC ON)
11+
set(CMAKE_AUTORCC ON)
12+
13+
set(CMAKE_CXX_STANDARD 11)
14+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
15+
16+
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Gui REQUIRED)
17+
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui REQUIRED)
18+
19+
if(NOT DEFINED ${QXLSX_PARENTPATH})
20+
set(QXLSX_PARENTPATH ${CMAKE_CURRENT_SOURCE_DIR}/../)
21+
endif(NOT DEFINED ${QXLSX_PARENTPATH})
22+
23+
if(NOT DEFINED ${QXLSX_HEADERPATH})
24+
set(QXLSX_HEADERPATH ${CMAKE_CURRENT_SOURCE_DIR}/../QXlsx/header/)
25+
endif(NOT DEFINED ${QXLSX_HEADERPATH})
26+
27+
if(NOT DEFINED ${QXLSX_SOURCEPATH})
28+
set(QXLSX_SOURCEPATH ${CMAKE_CURRENT_SOURCE_DIR}/../QXlsx/source/)
29+
endif(NOT DEFINED ${QXLSX_SOURCEPATH})
30+
31+
message("Current Path of QXlsx")
32+
message(${QXLSX_PARENTPATH})
33+
message(${QXLSX_HEADERPATH})
34+
message(${QXLSX_SOURCEPATH})
35+
36+
file(GLOB QXLSX_CPP "${QXLSX_SOURCEPATH}/*.cpp")
37+
file(GLOB QXLSX_H "${QXLSX_HEADERPATH}/*.h")
38+
39+
set(SRC_FILES ${QXLSX_CPP})
40+
list(APPEND SRC_FILES ${QXLSX_H})
41+
42+
add_library(QXlsx STATIC
43+
${SRC_FILES} )
44+
45+
target_include_directories(QXlsx PRIVATE ${QXLSX_HEADERPATH})
46+
47+
target_link_libraries(${PROJECT_NAME}
48+
Qt${QT_VERSION_MAJOR}::Core
49+
Qt${QT_VERSION_MAJOR}::GuiPrivate
50+
)
51+
52+
target_compile_definitions(QXlsx PRIVATE QXLSX_LIBRARY)

0 commit comments

Comments
 (0)