Skip to content

Commit 469abdf

Browse files
7bitcoder7bitcoder
committed
migrate fully to conan, bump libs versions, update cmake files
1 parent 856c875 commit 469abdf

File tree

15 files changed

+114
-189
lines changed

15 files changed

+114
-189
lines changed

‎SharpsenBox/.gitignore

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
2-
build
1+
/.cache
2+
/.vscode
3+
/.idea
4+
/*build*/
5+
.DS_Store
6+
CmakeUserPresets.json
7+
CmakePresets.json
8+
conan_provider.cmake

‎SharpsenBox/CMakeLists.txt

+23-15
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,35 @@
1-
# CMakeList.txt: plik projektu CMake najwyższego poziomu, wykonaj konfigurację globalną
2-
# i uwzględnij podprojekty w tym miejscu.
3-
#
1+
cmake_minimum_required(VERSION 3.15.0)
2+
3+
set(SHARPSEN_BOX_LIBRARY SharpsenBox)
4+
5+
set(SHARPSEN_BOX_VERSION_MAJOR 1)
6+
set(SHARPSEN_BOX_VERSION_MINOR 1)
7+
set(SHARPSEN_BOX_VERSION_PATCH 0)
8+
9+
set(SHARPSEN_BOX_VERSION ${SHARPSEN_BOX_VERSION_MAJOR}.${SHARPSEN_BOX_VERSION_MINOR}.${SHARPSEN_BOX_VERSION_PATCH})
10+
11+
project(${SHARPSEN_BOX_LIBRARY} LANGUAGES CXX VERSION ${SHARPSEN_BOX_VERSION})
12+
13+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CmakeModules")
414

5-
cmake_minimum_required (VERSION 3.8)
615
set(CMAKE_CXX_STANDARD 20)
716
set(CMAKE_CXX_STANDARD_REQUIRED ON)
817

9-
project ("SharpsenBox")
10-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CmakeModules")
1118
include(Config)
19+
include(CMakeDependentOption)
20+
include(GNUInstallDirs)
1221

1322

14-
include(${CMAKE_SOURCE_DIR}/conanbuildinfo.cmake)
15-
16-
find_package(Qt5 REQUIRED COMPONENTS
17-
Core
18-
Widgets
19-
Gui
20-
Quick
23+
find_package(Qt6 REQUIRED COMPONENTS
24+
Core
25+
Widgets
26+
Gui
27+
Quick
2128
Qml
2229
Test
23-
QuickControls2
30+
QuickControls2
2431
Network)
32+
qt_standard_project_setup()
2533

2634
add_subdirectory(Source)
2735

@@ -31,4 +39,4 @@ install(FILES Config/Updater/Games.json DESTINATION ${UpdaterPath}/Config)
3139
install(FILES Config/SharpsenBox/SharpsenBoxInfo.json DESTINATION ${SharpsenBoxPath}/Config)
3240
install(FILES Config/SharpsenBox/Games.json DESTINATION ${SharpsenBoxPath}/Config)
3341

34-
install(FILES Config/SharpsenBox/SharpsenBoxInfo.json DESTINATION ${SharpsenBoxPath}/..)
42+
install(FILES Config/SharpsenBox/SharpsenBoxInfo.json DESTINATION ${SharpsenBoxPath}/..)

‎SharpsenBox/CMakeSettings.json

-50
This file was deleted.

‎SharpsenBox/CmakeModules/Config.cmake

+10-10
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ endif()
2727
# "Qt32Bit": "C:\\QtTools\\5.14.2\\msvc2017",
2828
# "Qt64Bit": "C:\\QtTools\\5.14.2\\msvc2017_64"
2929
# } -> see QtPathsExample.json
30-
file(READ QtPaths.json stream)
31-
if(64BIT)
32-
string(REGEX MATCH "(\"Qt64Bit\"):.?\"([^\"]*)\".?\n" QtLib ${stream})
33-
else()
34-
string(REGEX MATCH "(\"Qt32Bit\"):.?\"([^\"]*)\".?\n" QtLib ${stream})
35-
endif()
36-
37-
set(QtLib ${CMAKE_MATCH_2})
38-
set (CMAKE_PREFIX_PATH ${QtLib}/lib/cmake/Qt5 )
39-
message("Qt library path: ${QtLib}")
30+
#file(READ QtPaths.json stream)
31+
#if(64BIT)
32+
# string(REGEX MATCH "(\"Qt64Bit\"):.?\"([^\"]*)\".?\n" QtLib ${stream})
33+
#else()
34+
# string(REGEX MATCH "(\"Qt32Bit\"):.?\"([^\"]*)\".?\n" QtLib ${stream})
35+
#endif()
36+
#
37+
#set(QtLib ${CMAKE_MATCH_2})
38+
#set (CMAKE_PREFIX_PATH ${QtLib}/lib/cmake/Qt5 )
39+
#message("Qt library path: ${QtLib}")
4040

4141

4242
if(CMAKE_BUILD_TYPE STREQUAL "Debug")

‎SharpsenBox/Source/App/App/CMakeLists.txt

+10-15
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

2-
qt5_add_resources(
2+
qt6_add_resources(
33
RESOURCES
44
"../../../Gui/SharpsenBox.qrc")
55

6-
add_executable(SharpsenBox
6+
qt_add_executable(SharpsenBox
77
main.cpp
88
Backend.cpp
99
${RESOURCES})
@@ -14,23 +14,18 @@ if(WIN AND RELEASE)
1414
set_target_properties(SharpsenBox PROPERTIES WIN32_EXECUTABLE TRUE)
1515
endif()
1616

17-
qt5_use_modules(SharpsenBox
18-
Quick
19-
Core
20-
Network)
21-
22-
target_link_libraries(SharpsenBox
17+
target_link_libraries(SharpsenBox PUBLIC
2318
ComponentRegister
2419
Dialog
2520
GameManager
2621
LoadingBar
2722
Config
28-
Qt5::Widgets
29-
Qt5::Gui
30-
Qt5::Core
31-
Qt5::Quick
32-
Qt5::Qml
33-
Qt5::QuickControls2
23+
Qt6::Widgets
24+
Qt6::Gui
25+
Qt6::Core
26+
Qt6::Quick
27+
Qt6::Qml
28+
Qt6::QuickControls2
3429
${CURL_LIBRARY})
3530

3631
target_include_directories(SharpsenBox PUBLIC
@@ -49,4 +44,4 @@ target_include_directories(SharpsenBox PUBLIC
4944

5045
file( COPY ${CMAKE_SOURCE_DIR}/orbit2.ico DESTINATION ${CMAKE_BINARY_DIR} )
5146

52-
install(TARGETS SharpsenBox DESTINATION ${SharpsenBoxPath}/bin)
47+
install(TARGETS SharpsenBox DESTINATION ${SharpsenBoxPath}/bin)

‎SharpsenBox/Source/App/QDialog/CMakeLists.txt

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
add_library(Dialog STATIC
2+
qt_add_library(Dialog STATIC
33
Dialog.cpp)
44

55
target_include_directories(Dialog PUBLIC
@@ -8,12 +8,7 @@ target_include_directories(Dialog PUBLIC
88
"../QConfig/h"
99
"h")
1010

11-
qt5_use_modules(Dialog
12-
Quick
13-
Core
14-
Network)
15-
1611
target_link_libraries(Dialog
17-
Qt5::Widgets
18-
Qt5::Gui
19-
Qt5::Core)
12+
Qt6::Widgets
13+
Qt6::Gui
14+
Qt6::Core)

‎SharpsenBox/Source/App/QGameManager/CMakeLists.txt

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
add_library(GameManager STATIC
2+
qt_add_library(GameManager STATIC
33
GameManager.cpp
44
GameUninstaller.cpp)
55

@@ -12,14 +12,8 @@ target_include_directories(GameManager PUBLIC
1212
"../../Component/h"
1313
"h")
1414

15-
qt5_use_modules(GameManager
16-
Quick
17-
Core
18-
Network
19-
Widgets)
20-
2115
target_link_libraries(GameManager
2216
UpdateManager
23-
Qt5::Widgets
24-
Qt5::Gui
25-
Qt5::Core)
17+
Qt6::Widgets
18+
Qt6::Gui
19+
Qt6::Core)

‎SharpsenBox/Source/App/QLoadingBar/CMakeLists.txt

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
add_library(LoadingBar STATIC
2+
qt_add_library(LoadingBar STATIC
33
LoadingBar.cpp)
44

55
target_include_directories(LoadingBar PUBLIC
@@ -12,12 +12,7 @@ target_include_directories(LoadingBar PUBLIC
1212
"../../Component/h"
1313
"h")
1414

15-
qt5_use_modules(LoadingBar
16-
Quick
17-
Core
18-
Network)
19-
2015
target_link_libraries(LoadingBar
21-
Qt5::Widgets
22-
Qt5::Gui
23-
Qt5::Core)
16+
Qt6::Widgets
17+
Qt6::Gui
18+
Qt6::Core)

‎SharpsenBox/Source/AppUpdater/AppUpdadter/CMakeLists.txt

+9-14
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

2-
qt5_add_resources(
2+
qt6_add_resources(
33
RESOURCES
44
"../../../Gui/AppUpdater.qrc")
55

6-
add_executable(Updater
6+
qt_add_executable(Updater
77
main.cpp
88
Backend.cpp
99
${RESOURCES})
@@ -12,21 +12,16 @@ if(WIN AND RELEASE)
1212
set_target_properties(Updater PROPERTIES WIN32_EXECUTABLE TRUE)
1313
endif()
1414

15-
qt5_use_modules(Updater
16-
Quick
17-
Core
18-
Network)
19-
20-
target_link_libraries(Updater
15+
target_link_libraries(Updater PUBLIC
2116
ComponentRegister
2217
AppUpdaterManager
2318
Config
24-
Qt5::Widgets
25-
Qt5::Gui
26-
Qt5::Core
27-
Qt5::Quick
28-
Qt5::Qml
29-
Qt5::QuickControls2)
19+
Qt6::Widgets
20+
Qt6::Gui
21+
Qt6::Core
22+
Qt6::Quick
23+
Qt6::Qml
24+
Qt6::QuickControls2)
3025

3126
target_include_directories(Updater PUBLIC
3227
"../QAppUpdaterManager"

‎SharpsenBox/Source/AppUpdater/QAppUpdaterManager/CMakeLists.txt

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_library( AppUpdaterManager STATIC
1+
qt_add_library( AppUpdaterManager STATIC
22
"AppUpdaterManager.cpp" "h/IAppUpdaterManager.hpp")
33

44
target_include_directories(AppUpdaterManager PUBLIC
@@ -9,11 +9,7 @@ target_include_directories(AppUpdaterManager PUBLIC
99
"../../Component/h"
1010
"h")
1111

12-
qt5_use_modules(AppUpdaterManager
13-
Quick
14-
Core)
15-
1612
target_link_libraries(AppUpdaterManager
1713
UpdateManager
18-
Qt5::Gui
19-
Qt5::Core)
14+
Qt6::Gui
15+
Qt6::Core)

‎SharpsenBox/Source/Component/CMakeLists.txt

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11

2-
add_library(ComponentRegister STATIC
2+
qt_add_library(ComponentRegister STATIC
33
ComponentRegister.cpp)
44

55
target_include_directories(ComponentRegister PUBLIC
66
"h")
77

8-
qt5_use_modules(ComponentRegister
9-
Quick
10-
Core
11-
Network)
12-
13-
target_link_libraries(ComponentRegister
14-
Qt5::Widgets
15-
Qt5::Gui
16-
Qt5::Core)
8+
target_link_libraries(ComponentRegister
9+
Qt6::Widgets
10+
Qt6::Gui
11+
Qt6::Core)

‎SharpsenBox/Source/QConfig/CMakeLists.txt

+5-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
add_library(Config STATIC
2+
qt_add_library(Config STATIC
33
Config.cpp)
44

55

@@ -8,15 +8,8 @@ target_include_directories(Config PUBLIC
88
"../UpdateManager/h"
99
"h")
1010

11-
qt5_use_modules(Config
12-
Quick
13-
Core
14-
Network
15-
Widgets)
16-
1711
target_link_libraries(Config
18-
Qt5::Widgets
19-
Qt5::Gui
20-
Qt5::Core
21-
Qt5::Widgets)
22-
12+
Qt6::Widgets
13+
Qt6::Gui
14+
Qt6::Core
15+
Qt6::Widgets)

0 commit comments

Comments
 (0)